From 555dc1a92576255d228f35bbd800836f605c9caf Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 23 Nov 2023 10:44:28 +0800 Subject: [PATCH] =?UTF-8?q?[add:]=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 73 +----------------- .../mapper/system/SysCustomerOperMapper.xml | 2 +- .../templates/system/customer/customer.html | 42 +++++----- .../framework/web/service/DictService.class | Bin 1277 -> 2720 bytes .../generator/controller/GenController.class | Bin 9478 -> 9365 bytes 5 files changed, 26 insertions(+), 91 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 94697aab..887464d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -5,51 +5,34 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.flow.domain.BizRequestItem; -import com.ruoyi.flow.service.FlowService; -import com.ruoyi.framework.shiro.realm.UserRealm; -import com.ruoyi.remind.domain.Remind; import com.ruoyi.remind.mapper.RemindMapper; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.domain.SysCustomerOper; import com.ruoyi.system.domain.exportDto.SysCustomerDto; -import com.ruoyi.system.mapper.SysCustomerMapper; import com.ruoyi.system.mapper.SysCustomerOperMapper; -import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.service.ISysCustomerService; import com.ruoyi.system.service.ISysDictTypeService; -import org.activiti.engine.IdentityService; -import org.activiti.engine.TaskService; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; -import org.omg.PortableInterceptor.INACTIVE; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mapping.IdentifierAccessor; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.net.URLEncoder; -import java.util.*; +import java.util.List; +import java.util.Map; /** * 客户基本信息Controller @@ -262,57 +245,5 @@ public class SysCustomerController extends BaseController } } - // 添加修改客户表 - @RequiresPermissions("system:customer:add") - @Log(title = "客户基本信息", businessType = BusinessType.INSERT) - @PostMapping("/addCustomer") - @ResponseBody - public AjaxResult add(HttpServletRequest request) { - String keyNo = request.getParameter("enterpriseCode"); - SysUser user = ShiroUtils.getSysUser(); - SysCustomer sysCustomer = new SysCustomer(); - sysCustomer.setEnterpriseName(request.getParameter("enterpriseName")); - sysCustomer.setCustomerPurser(request.getParameter("customerPurser")); - sysCustomer.setEnterpriseCode(request.getParameter("enterpriseCode")); - //业务员 - sysCustomer.setBusinessMembers(request.getParameter("businessMembers")); - List sysCustomerList = sysCustomerService.selectSysCustomerList(sysCustomer); - if (sysCustomerList.size() == 0){ - sysCustomerService.insertSysCustomer(sysCustomer); - Long customer_id = sysCustomerService.selectSysCustomerList(sysCustomer).get(0).getCustomerId(); - keyNo = "KH" + 00 + customer_id; - sysCustomer.setCustomsCode(keyNo); - sysCustomer.setCreateBy(ShiroUtils.getLoginName()); - sysCustomerService.updateSysCustomer(sysCustomer); - //添加时间 - sysCustomer.setCreateTime(new Date()); - //发送添加客户提醒给上级 - Remind remind = new Remind(); - //接收人 - remind.setReceiverName(""); - //提示信息 - remind.setRemindContent(sysCustomer.getBusinessMembers()+"申请:客户"+sysCustomer.getEnterpriseName()+"事务部"+sysCustomer.getCustomerPurser()+""); - remindMapper.add(remind); - } - else{ - return AjaxResult.error("该客户已被其他业务员添加"+"客户名称 :" + sysCustomerList.get(0).getEnterpriseName() + "事业部: "+ - "" + sysCustomerList.get(0).getCustomerPurser() + " 业务员" + sysCustomerList.get(0).getBusinessMembers()); - } - //添加的时候插入记录到我的请求 -// if (add) { -// BizRequestItem bizRequestItem = new BizRequestItem(); -// bizRequestItem.setCreateBy(sysCustomer.getCreateBy()); -// bizRequestItem.setCreateTime(sysCustomer.getCreateTime()+""); -// bizRequestItem.setTitle(sysCustomer.getBusinessMembers() + "_" + sysCustomer.getEnterpriseName()); -// bizRequestItem.setModuleUrl("Syscustom"); -// bizRequestItem.setModuleName("客户表"); -// bizRequestItem.setKeyNo(sysCustomer.getCustomerId()+""); -// bizRequestItem.setDelSign("0"); -// flowService.add(bizRequestItem); -// -// -// } - return AjaxResult.success("添加成功，" +1 +"一条数据"); - } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml index b578f449..64a41938 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerOperMapper.xml @@ -19,7 +19,7 @@ @@ -684,7 +688,7 @@
-
@@ -704,15 +708,16 @@
- +
- - + + +
@@ -754,7 +759,7 @@ if (value == 0){ return "待审核"; } - if(value==1){ + if (value == 1){ return "审核通过"; } if (value == 2){ @@ -769,7 +774,7 @@ if (value == 0){ return "否"; } - if(value==1){ + if (value==1){ return "是"; } if (value == 2){ @@ -1071,11 +1076,9 @@ function submitHandler() { if ($.validate.form('form-contacts-add')) { - $.operate.save(prefix1 + "/add", $('#form-contacts-add').serialize()); + $.operate.save(prefix + "/add", $('#form-contacts-add').serialize()); $('#infoModal').modal("hide") } - - } // 列表联系人明细 @@ -1642,22 +1645,23 @@ }); $("#detailsModal").modal("show"); }) - function quotationAudit() { + function showCustomerAudit() { let data = $("#bootstrap-table").bootstrapTable("getSelections"); let userName = [[${@permission.getPrincipalProperty('userName')}]]; if (data.length === 1) { - $("#supplierQuotationId").val(data[0].supplierQuotationId) - $("#auditNo").val(1).trigger("change") - $("#auditName").val(userName) - $("#auditTime").datetimepicker("setDate", new Date()); + $("#customerId").val(data[0].customerId) + $("#deginflag").val(1).trigger("change") + $("#identifyingPeople").val(userName) + $("#updateTime").datetimepicker("setDate", new Date()); $("#AuditModel").modal("show"); } else { $.modal.alert("请选择一条数据"); } } - function AuditConfirmSubmit() { - var auditNo = $("#auditNo").val() + function AuditConfirmSubmit(e) { + $("#deginflag").val(e).trigger("change") + var auditNo = $("#deginflag").val(); $.ajax({ url: prefix + "/edit", type: "post", diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class b/ruoyi-framework/target/classes/com/ruoyi/framework/web/service/DictService.class index 6696d1f76e32e2627ad9c4e1cddb08904eb371e6..0d9e6cee4f13659f0d4a4ee66d0d31e87a7c9bc4 100644 GIT binary patch literal 2720 zcmbVOYjfK~6g}%WmSZbTnxp~qYzu|F)f5ULPE(wuPu#TBZ9<#!Slg>@ z7w{Drh7vl%@R^^)hr(G|wv@UvO&KSv)#~oqd(XZ1NPj>3<4*t|!_8n4>q9t(jVvzU zqMBXG;xevixSBx<>lu83Viwo1nZc%pC{~T=3K9CQkQI~ejDEW$l{B&oj z5Xn8(2q`MhVe)Me+7%EvcTly`Rj&2_UawX<4Gud!#qvE)xQFR*9vJI2D^4mt3 zNyS%wRe3?Ti?VFinX?xh((hOpNjy0Es$$ua^%i{{4v8q4b+h7=81?MB9V8$KGa%ub zZ1VKMhn+o1-~555S=OCmRe2|{_{sq>^RDT&>Vz8YCwwG^u5utSc`*O%hOh?C#&*-w zm3|ufR}`CwQR3cOE{w!zEu<_837Bmxdh;_XKuckm%7ezSi*#PU(0P zZ)x~e$9I?&7>}x|;JUJ{h}R%>lu=>GI;t=kw~qU$>DYxOz|QDO-J!@7I2s*tS$eyq zRL2AC>8N8*LqmrRM@JLi3(Q8~FBJ|l6aWY9biMo_=$IqXS)Do^ix#esCrSAfn2U~K zVZTJK1tz?pAG__f)>h(w7?hZ_QbQw@P&F2m(95Q*?3#*I%8titUG=_t6&UNi`E80H zg*9V&n~r~>(e&GVhlHgVbVy{HpXMtnZS`WEoQl_Hmjkwmwky5OKszY)+>^9}n~AP{ zj8|IglqN+$s8k27LZyzZ!T^UO@|ktMQ<^PG#{seIBrYG*gm5J;mf;csWVI@AEZ&4& z^Sd~~SN$YE0uubO=2Ic(!$_X@H#m21mfpl%W;kh0E9ll zQSTVwB;Mm4-&Z)r!_?;U!LdMg=2s+U_c4&bPh3vmIL8jesQ_Ymr1cPSTThX? z^90(p$mz}b-;sWdd-MAk5?D^=lKaRAJjPWu%L@DjeR=RHhPm&^aw<3Y8%CBjbs1ew z=Tc)wbJ{+}2C&WfcrM+U&*f74m`Gsz$A5pBQ?w)lTF%fpAdfUwFphIf(<+w8WC5S^ zgRQ_1vo-8s9W`uF9xlMcr6Aaw+)-e<7Wki{9y311we%yc@PALGz*8nlXPXQ+j>#FiV7un{bXox>7$ATl@L5=d-VSX#Ip zYvP@0qltX^zvKJ8@Bcm4zWw&+&)Yk&$wn2ArcarrfMr(ltQD|I+oR)=Jf9tuvJYps z>s}w8U!7Pu$EQb^hG9kw6?~7>utsDs40)^@y2KVqc5fxwms_*ahr2Y}FYj&95Va@K zl1!UeR8^G~gQ6>fe?42Zgyh3)yAriV`*;W$Q*JZ?mvJT(EowyK4zrs|d^^C_3v50? zN3$7=elH1)YT3FODl R7pn`!xq&3=dW{Pfe*ylUAoc(N diff --git a/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class b/ruoyi-generator/target/classes/com/ruoyi/generator/controller/GenController.class index 1818050814c92b73533c688d3203ccc77241c0c5..0ef98e69c1652f4e848e247bd21e581585cbf542 100644 GIT binary patch delta 3549 zcmb_e33yc175>kgN#11UIT$t5+IonmM9vOh*8!gfKfsOfdq$;5E7e=2y~fl zQrjw3UWwh+Dz%#y8=Ej-QM^?dpXm0dKKu+nSLzoY?DpbWJg3sX^x#)sJdaC{dgWr1b zJG`K*-|O zScabWWE)a8^rE-a$X|n20*m(b_0)7mdMz|#rJ%sRGf*(wlF2ef;C2{t4mMaa6|ELl zVYMmKEGd@?OQy>VOJ+)iV1~WXn{U6I6^vQ90#}++X-SoYEvc4S^leFv(BvGMYsx%J zYUNx@&Xf6qoSweUuHNSM?GaPXx8wq;69l^3ceK~^wD)$_v_$*6dOIyyAQzf)ktGYI z-ja)DktLT%gCNh5ye`_+Q?sbQzkOF@*Fav>l1t?>25ZS;Sz^gjS!S2{D_nwdVl17~ zu(Ku76WL6$svSz$>dDXftuOPZy@-s_*Wex>qO>9Sfbx1>d*D6!-UVQ6bCX_d8> zw8>SLtkY$^Ty4n)*{A?FS<)^Y79PSkE!j*49#L+)Tw_Yak}YVp3v(At>69jczoD-; z8tIKzH%59pqgw?~KwB;8k|sNv8xC}<>Ne>yWxFN4(l>N4cVpJjz{DM{hDMGK;DVu5 zBV}l5Ah?`#Hh){3GuGmivjF$3JJ+>#I8;*AMmaCFfthUXDqKa%A{X#s9oF+#a5Xki zVy*pjak0HObXL9Us1IO%hI~O%UJ(Q-zmXD~)V{a7ns?-Djv^5p^=N+mXud zZc=Z>+cY+NX~_a7v-!xP{T*C)B7j{e!fsShN@J~cc$KMGEAe)AtnjoP??8-p0+fHJ z6KfIacaiH(MV;VvC!?N4P9~~%!fOYaY5$1zp#Fs9X+M^N4tGKW#285%*BLk}Z6IDHs1bTgBiVR%MRS?4)|GRjP@ z%TY#^{a|TPEL`UcArJqIAj#H?vYk;;1pude7)c$P>yL#_Uj5$TN1fA{?AU zwYja~;Ji@QA=E0JG+FroTx#*$gr$Q_uN!SlA{Mfv!94hI1M-=QGA3goK8S6&iJf&b z2HAyA;1)cETX7uw_)dM8uj76`gM)Ylw>g#C!kb_a^Y8&`_^8=W{hQd6QC8z-)+dJ+ zZ+E8C)HIG&RQROsrFpg(4{xCZ13qr{ag1FA^D1mAy9wzfI^D{`>p<(^B@FMU;e=Fo zN@_o)1}W76_b6t-G;y1WkC^zViI181xbyc3KFPevd?sS2VLF1J920yED@Hj}+2ifd ziO!Rs@Y6m1DaOe&9h*D&f71X1WOTR_pH4IrUpa&SfI^nU8>@=rJOfISns49`O0+fx zYcqE3+{NVHjR`p5q&h#LJeEQfCNDjOa&nX31vYs`kKdiq;|H7`zg_EZ3gLZ*+Jbu$ z!%2EEH5H^kiR}DSkR>ku`-tpI8L0dzRDOKc8P)NqK6etT*dBa71J)OkqxVJJ%Yy0+ zsQ13!@_{6f3k)=c51~$z z!(%ubk2}Z{cY82}JctqYgWkVE#Frbus z9f&zC8Yle_Ywz54<7$7=X={I+wLfu&+AG+^2gS)9IUZP5dU75Y8pz_G~~Qy2F*=yUNaZ_fZzPAuKSeg{;wpaWB7&>gQ4G$Fj|}ex|Qa1 zfa-a_Tr8*xE(%@}M}v#hrOCG;co`ps@X=u`=0g?766Gz8W0`?4m6i*ea7D6p?ZIhf qtJB|J^{Ke(Q*qThF=UREfk&Ojf6N&!{la^k`zKi0P0m-|lWzcSB1t#^ delta 3649 zcmcInd3;pW75>hfN#11UF$t59WCAfr2#}4iDVm@Gg6yjiLjni`gb)%ENdjeQJ6aT% z)>`^1wsx~B+D%-rAxlfCw$@s@s?~08ZSCgPRg10kJMT?iCJ6j~{iDAmcg{WM+;hLP z-7~pu!TyEuC*SQm24I@(3}Pux1n`42EWr;={3r-NPU!OE0DhvMKMhjyl!~7Y;Til) zx6dl|oQabD@%Wcg zCr!K)L^=Mg%YW3!yDB>sfE^Tw1kfK8Lwo_;8^V@n#Lr75MVC}vOrnv1QfYKhf=Y#S zv2+<0lCY!)BqJchm5c-=Gay-nAtQ939grOT%+)0tlsp+}$|zIvkHng}lqEuKiNhb43OQy(FOQy*Mrd(*r zbh*fqi=|SK*4p0G+_p5ftL=f{d-Pow176SX)y?ZC6KgTazW1O0_97Etw^= zEvb*`S#8Q1OV-L& zmaLQYmc(?~AR8^&B#jDhvn5Tk#lmqsZb>r*cvPiLvelFpOIoqY4y9L}zfEcd;hOfg zuEw^m^2Lp9OAZ0Znt6UJ&nP;V(?X8kcplFU-q?z5-tBE@r(AHgdpqfEFzj&N=p+ow zh+#P`uJ}J;*q*@9fliG8G29BDeSh90X|SKq8yVM#mkB)%?P-pz#PhWTA7uQ6+#w!ZXr~Ne1ffJ9RV~h^BR8ax^6x z7~st)i%cQBsdZ(MY0;D(T%dHqWXU7&sl^LjOAj&!el#$uY_tq+u47YQk8JGc@Vo(+ z;wDbx4>L6%!9LuALoCea@G%bO19%x9$E)}Rr|NBZ3kSuA+nwZX=3{XPQ+a9!ZS6q^ z&)&i^-N$r&lz(Zode~`OQzPppnfH^tm8MyBqz=%yfsmxbW`FyTEq-3rOsoZXhZi=p z7PQm#J#Y;lq+wU9#nU=St=p-!3@N8D0j7yhn)sB7J4}4q#Alq}&+;1pHpdY%|NMOG`@2 zkK&St$aUlAjCtdU=b^$UcUXJphwlew`N#MO;G8AmDGD z7UE+`4t#TJgfFRt9HCdZZ3n>t{w1%(`Nd`?|a-o$;i5$ H_Wl0?Fhpbb