From bc6c86fdc0b8fc3f69b4e548081c53c49f56c1cd Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 11 Apr 2023 10:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=87=87=E9=9B=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/config/WebConfiguration.java | 2 +- .../mailGather/EmailMaintainController.java | 92 +++++++++++++++--- .../model/mailGather/EmailMaintainExcel.java | 23 +++++ .../mailGather/EmailMaintainService.java | 3 + .../impl/EmailMaintainServiceImpl.java | 12 ++- .../impl/MailGatherLogServiceImpl.java | 8 +- .../main/resources/export/gysTemplate.xlsx | Bin 0 -> 11083 bytes .../mapper/mailGather/EmailMaintainMapper.xml | 4 +- .../erp/entity/TDxRecordInvoiceDetail.java | 5 - .../resources/mapper/SignInvoiceMapper.xml | 2 +- 10 files changed, 122 insertions(+), 29 deletions(-) create mode 100644 dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainExcel.java create mode 100644 dxhy-core/src/main/resources/export/gysTemplate.xlsx diff --git a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java index 50ba2ef3..a935bf45 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java +++ b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java @@ -65,7 +65,7 @@ public class WebConfiguration implements WebMvcConfigurer { private ArrayList getIncludePathPatterns() { ArrayList list = new ArrayList<>(); String[] urls = - {"/excel/apply", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", + {"/mailGatherLog/**","/emailMaintain/**","/excel/apply", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", "/invoiceDetail/saleInfo", "/smcy/info", "/invoiceDetail/companyPoolInvoiceDetail/**", "/pool/**"}; Collections.addAll(list, urls); return list; diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 0823020c..b2f4cf11 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -1,22 +1,29 @@ package com.dxhy.core.controller.mailGather; import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.UUIDUtils; import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; import com.dxhy.common.vo.UserInfo; +import com.dxhy.core.model.mailGather.EmailMaintainExcel; import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.service.mailGather.EmailMaintainService; +import com.google.common.collect.Lists; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -110,16 +117,79 @@ public class EmailMaintainController extends AbstractController { /** * 编辑数据 * - * @param emailMaintain 实体 + * @param file 实体 * @return 编辑结果 */ - @PostMapping("/emailUpload") - public ResponseEntity emailUpload(@RequestBody EmailMaintainVo emailMaintain) { - boolean b = emailMaintainService.update(emailMaintain); - if(b){ - return ResponseEntity.ok(R.ok()); + @RequestMapping("/emailUpload") + public ResponseEntity emailUpload(@RequestParam(value = "file") MultipartFile file, + @RequestParam(value = "deptId") String deptId, + @RequestParam(value = "deptName") String deptName) { + + try { + List emailMaintainExcels = + EasyExcel.read(file.getInputStream()).sheet().head(EmailMaintainExcel.class).headRowNumber(1).doReadSync(); + log.info("解析的数据:{}",JSONObject.toJSONString(emailMaintainExcels)); + if (emailMaintainExcels == null || emailMaintainExcels.isEmpty()) { + return ResponseEntity.ok(R.error("数据解析失败")); + } + List errorMsgList = Lists.newArrayList(); + List mailList = Lists.newArrayList(); + + int resultIndex = 2; + for (EmailMaintainExcel maintainExcel : emailMaintainExcels) { + String userId = maintainExcel.getUserId(); + if (StringUtils.isBlank(userId)) { + errorMsgList.add("第" + resultIndex + "行,用户编码不能为空"); + continue; + } + String userName = emailMaintainService.getUserName(userId); + if(StringUtils.isBlank(userName)){ + errorMsgList.add("第" + resultIndex + "行,用户编码在系统中查询不到,请核实!"); + continue; + } + String address = maintainExcel.getEmailAddress(); + if (StringUtils.isBlank(address)) { + errorMsgList.add("第" + resultIndex + "行,邮箱地址不能为空"); + continue; + } + if(!"@qq.com".equals(address) || !"@163.com".equals(address)){ + errorMsgList.add("第" + resultIndex + "行,不支持该邮箱类型"); + continue; + } + String password = maintainExcel.getEmailPassword(); + if (StringUtils.isBlank(password)) { + errorMsgList.add("第" + resultIndex + "行,授权码不能为空"); + continue; + } + EmailMaintainVo maintainVo = new EmailMaintainVo(); + maintainVo.setId(UUIDUtils.generateShortUuid()); + maintainVo.setCompanyCode(deptId); + maintainVo.setDeptName(deptName); + maintainVo.setUsername(userName); + maintainVo.setUserId(userId); + maintainVo.setEmailAddress(address); + String encode = Base64Encoding.encode(password); + maintainVo.setEmailPassword(encode); + maintainVo.setDelStatus("0"); + maintainVo.setCreateUser(getUserInfo().getLoginname()); + maintainVo.setCreateTime(new Date()); + maintainVo.setModifyTime(new Date()); + mailList.add(maintainVo); + resultIndex++; + } + if (ObjectUtil.isNotEmpty(errorMsgList)) { + JSONObject json = new JSONObject(); + json.put("datalist", errorMsgList); + return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString()))); + } + int i = emailMaintainService.insertBatch(mailList); + if(i > 0){ + return ResponseEntity.ok(R.ok()); + } + } catch (IOException e) { + throw new RuntimeException(e); } - return ResponseEntity.ok(R.error()); + return ResponseEntity.ok(R.error("数据解析失败")); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainExcel.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainExcel.java new file mode 100644 index 00000000..72760453 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainExcel.java @@ -0,0 +1,23 @@ +package com.dxhy.core.model.mailGather; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.dxhy.core.model.CommonDTO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + + +@Data +public class EmailMaintainExcel { + + + @ExcelProperty("序号") + public String xh; + @ExcelProperty("*用户编码") + public String userId; + @ExcelProperty("*邮箱地址") + public String emailAddress; + @ExcelProperty("*授权码") + public String emailPassword; +} diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java index 220990ed..99328e74 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java @@ -1,6 +1,7 @@ package com.dxhy.core.service.mailGather; import com.dxhy.core.model.mailGather.EmailMaintainVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -48,4 +49,6 @@ public interface EmailMaintainService { boolean deleteById(String id); String getUserName(String userCode); + + int insertBatch(List entities); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index 7f2c9d9d..892b849f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -30,8 +30,6 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { /** * 通过ID查询单条数据 - * - * @param id 主键 * @return 实例对象 */ @Override @@ -46,17 +44,16 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { */ @Override public String queryByPage(Map pramsMap) { - List returnList = new ArrayList<>(); + DynamicContextHolder.push(DbConstant.BASICS_READ); JSONObject json = new JSONObject(); int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); PageHelper.startPage(curr, size); List emailMaintainVos = emailMaintainDao.queryAllByLimit(pramsMap); PageInfo pageInfo = new PageInfo<>(emailMaintainVos); - returnList.add(pageInfo.getList()); // 设置记录总数 json.put("total", pageInfo.getTotal()); - json.put("datalist", returnList); + json.put("datalist", pageInfo.getList()); String jsonString = null; if (json != null) { log.debug("返回结果:{}", json.toJSONString()); @@ -114,6 +111,11 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { return emailMaintainDao.getUserName(userCode); } + @Override + public int insertBatch(List entities) { + return emailMaintainDao.insertBatch(entities); + } + //根据用户名进行查询 public void getdeptInfo(String deptId){ DynamicContextHolder.push(DbConstant.BASICS_READ); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java index 1f8d683f..83ebd997 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java @@ -3,6 +3,8 @@ package com.dxhy.core.service.mailGather.impl; import cn.hutool.core.codec.Base64; import com.alibaba.fastjson.JSONObject; +import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.mailGather.MailGatherLogDao; import com.dxhy.core.model.mailGather.MailGatherLogVo; import com.dxhy.core.service.mailGather.MailGatherLogService; @@ -42,18 +44,16 @@ public class MailGatherLogServiceImpl implements MailGatherLogService { */ @Override public String queryByPage(Map pramsMap) { - - List returnList = new ArrayList<>(); + DynamicContextHolder.push(DbConstant.BASICS_READ); JSONObject json = new JSONObject(); int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); PageHelper.startPage(curr, size); List emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap); PageInfo pageInfo = new PageInfo<>(emailMaintainVos); - returnList.add(pageInfo.getList()); // 设置记录总数 json.put("total", pageInfo.getTotal()); - json.put("datalist", returnList); + json.put("datalist", pageInfo.getList()); String jsonString = null; if (json != null) { log.debug("返回结果:{}", json.toJSONString()); diff --git a/dxhy-core/src/main/resources/export/gysTemplate.xlsx b/dxhy-core/src/main/resources/export/gysTemplate.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f43bde464fa00992d7f18f0dc1f2bbe9fc6295c5 GIT binary patch literal 11083 zcmeHtWmKHY(k||OG6*SbAxyz1%cr{1or=_*ATNGJrb#}O>QBK-LLKLh^Zg^`V+qP>kRh*|ML4C~(Q1;9y|p5MW?ve-|^bwPkX#vP_HZkcMQ%0-XEZqgC0kTLE&7l%dd_QEIk% zjlb6TCK*Yli|u@@9}8S2sUL4sI$|G|&6Eec*xw)WTu3G8G}$SpK<2I}liD&(RD=+p z)lLCQGvgHalS}hU#|=&3OK!pNr-j}Mr1NO`iy@~6z^$q@ik22cxYqhfUl~-&*&^)F zg&H`>7>A3}bAQ;*hw!&dr3glvf};xdP_%(GlTGEiSQ=X>P8ii=;&KGTxv4LgDWeEV zSfNXa8x1aadyPACwQ+-FG|v||=h{J#%9T0ByK-t}Dwx0a+RYSGWlpjnuOoV)yeDfC zxHlepzR~w_y2%#aq~ong+HS>Jtsq*QHCf1F4;QIDl;L~ZtPfD$x<(V0kXF62{P6^ z*1lc>XyYifJwBxw4&>?TW(igZQ$LVcv~64rX`!W0X0@N%L}hUu!0bs`ECxvRb$< z6)lsgOta;?E>%2)+8Vdgw>OH@-hsvUDzjwy&Px|?^yaAXHTV(mIg9D8k&eFDnjV@z zTLoR;;jb=bkvpykpyY0-YB0Ad>}Q7$Sq4o+2gE2m7eZne)o>Yvb2U8>Qb!Evl*BB=1w+&STZy&VSv28dmuRTtX6YHoJb9$jqYIBO?PURi*_urd^WD1YdS@I~3o6elPMJi=fG=R_I~l*(jZ(iLypGVq zw&2bO<*gZ~)8sG`FQ|s@?wJXh+DdeD~aKwNk%1 zm)M|K(2uM-g1Rz(pxkG|1r6E{Z><8PyM?nyd5fl7tP%NIOHcyq{atQXc#z2rLOM+m z(Ae)KPF8_a`7v*^;J7A*iSPkMiN1ML2@`s~sGS8ag-F73&wlu8NY$dm} zA_sg2gVS99n*pSpA4w(caR?jL@rF27TcLgo`5(s}W((>M7`*HXPsfv=)#>{BbPI=- ziH2JF*2ZgDT=-}SbeC(uuT>UDmshh^xdjX}2*Y(BsB~gY>-FRF8f#1b-dAT$Z|K&6vMLdl?3eoy%ar_`#8AY%9ewU_7?Zxp>5{%Nhf)aE z8xgU7E%nZefbn%w#T0sBlTbWR!i6;hImPFs*lz5)EPT!^k7$wAu!E`7!K%CHAC-2! z&Z`S={R;0%&c}8flIlKjWzcG3628>JJwNgAtXmBFlplBstK&6JEMw)FFJ@WN?YH2D z_1Rw#-}(Hcp19tX5iQcKk>|X%wnP|{hT(TbJ;#KGW10bl1(<=Hm%)Y3_3o=N zhPOeJivyb8EW4dNvxwgOf*7a05W!Py5A;__5Cs+NHZ4t42&raP+I^gfU7TA2<4Qv@^0{mPH15=qj6yzvV!-8d>VDOswL!7;@qJ!rtfNmvj~d_g%E>vB(Co~ zAl7SlzJl-`-sj66w8o6A^rYAFjK%_XqD~;_ZR)EVY*?skJ-VomZA~YJucd%ktG!jn z`sXM;BOd4PlkdU*^nz<1XSt0JUeN4e7yXAF#P)Ls#SK}{v!DUap|4P(&e6Z;n{5j# zE6%XY0emyJ4CQ3VLsd+(S)$i(t)gGuR1IaysR90%or}fm|p6*Sn`GK20)F2PTsE3Z9R+evH<&S&*!@$ zeI#nulzsQNE{XVh$*~)la2%f}*ODSKU}t=$LOVMTFf+L^N>(U!H=An6oYOhS21O=e zPMNK$|HnJ?MiAQkV>mTv-`994Pn!ot#amrG94s(j5%SM^+-J|$%+Tr?yO3SYQN)eS}O(QQo62xg+z|x*=k=Z5jui?skW)6-C6^pblx100mK#J)yc#s zhOLqp-9h|c+nfFW+x!1@d;fDZea!eD!mWcT&!ZY2l!a9%sQ>`KD&M`Be&vZee#3 z(dI)RAE^{5jMa=RLsKNPdkDRG=l38`)}Fer4?qoM;(c>_dwXTEv69D!E_VG=a&R^O zm4Mz6TBxUBuHD#)^-0sl6h8%aRB+-^B1a2t%-6ig^QEScX*J2`e)^sa({_`H@1&>R zC*-1bX{2w!hZ1jsUKXlYDyW;p0H>T~OI@dH@;lhm7Pdjrc-Tftd4-|jf@?#Xi&n1Ick zi>T1c#2A+~sapX#5J|7O6`FL4UYRqs3VQ?P*TqY|6u(f`WKe>vdRxnL^BP!N*RZ>c z+`qB|x_E6-y{PMW2xD|q0=n1_>^1+?L!j7i%AYP~5$x1NdrHW*V%db%3UgR1jgXN= zihsO0!644B9{z^0^JBv%gfJwYI)}Jil5K3o_lWV5`jK`+Xsy|v^I(Ft4* zCAotxD6u!gn=M{vdpjlyV>>2qQ4a(Jn$Nqw-ChTuw|=Zi4V>pj2}9KLyd5CXTL82P zT^@hw8XY{U3b{XRf*tj~t09ELwilnX_mZ2sr$GIZgnJ3xOI=)0%Iaz1p zm;hhf#CYPu!~1H69(r~Xvg`I@2IjEEdJ=xf?x=W!od7?Zg3uPSBMF_30=HVoPNAGo z*1#mZ2HQ6Yy)L&nS+WNypNmhf6vtuf)3=IYF9nGgyp;P4#3QIZDIlf$NqnnQq zU92Pg`fe}(BYcX6=CLIS?Nqq!eJ4gsAoUTGZ)xIE_E)t{XY9G_(N~**29GmGSM{(g z>7AhNv$^~qQ8-**$pJT;_|(c z*oo{`y`}(6ZrbX1h_p&$dvb|twTjg1>YUk0*_*aQYEx8P8}=-&<@iYJQvo9|B0^B= zx`C5z#>g8)!~Kf$i&r$D@S{%6M#&%-No5kVmJLr;PWiz%Kza1CU}P9iC;nb@XlrD- zGsgO~ZYh9ME%YwiK}+QOD!6o4_(CE%2^`$GxSq|-Eza#BN7PGhGdFT>x-P?bpXoen zDpthhxq(-mLAM_UEUP@$KZ)ljra-CH-&Q(hsLT{WhDMts4vhr`B}t3<^d!f<^KL*f z7NCcgE*>Aq)zI|Uzv#;a<7+IZ%t1d=8=nnCx8l1_PEZz9dU?|M4IIBRbf#Nqr zG+Mg;hy`1ut^G8$t}e+w9F*+PBg5)ny_!f#CO=drKh6-xxPXe>V>To1It9x#7Vs(SukCEz~=)5Q$pE2A5&j?-Nc|w zzY_BwjQy>5bv!0!i8VoSxpO(-7+7cI*a)IdSqw>=d_fwVi%kqt2^ehXYG|*h)OW#W zsY@#?mW#j63t)*BrkKYjfcx{|d+)m^i}(w_;OX%I(P_4x&k)0fixZ5b93$R*Ln`^3rRd=e7NlxA&1GvAdThLFX_70uOav!cV_p&6u zcnPmfL3WFJCPe2UF8gc;xpwqCv+nuDtth5{rEj622?1&@VlEM(@Tw846^ohjRE^nA zZdroWl*z)@y2smRS~5-;-Wd}!uAucQko^%uWZLVQ54A*Ersjvc<5+=NN>0(NQLI9V z*xth{{`1S5j2E-|o$)m_$fm0be9jX84L{hSC9iaxLN{1kD1IDZ7ZAk zDeOBz{d-@GC(-GuMT_dKq(=E?87xoilN z^O;3(M+((=Pi}Kc-VGKyo1!%3FrN22ET{PHAU6qmoS@Lho1{kGt}wMTrYg|O%GjSM$5-=aW-*Z=KVZ?aLm?NT`l0I)woy-?#*_r zI9jWta11WK4D{&RLXn$zV}G`TJ4(E)9;{;nwMiaO9JFt+3(Xjuu4@AUhHTY`MO*foE!ZGRiCmpLK+(2FHIUQ4%`0-doEdOG1=4mU$#H}ZLU&5pJ|VsVi$N*R315^yWd!xX`Z8QF=eDPzNR+MJMo2uH_gMLObKbD z#KMO@aXZ#k-qC{bhG1ufii=J~))Mv)gqvcOru7s8$h#7Cb{4aOR+CbG z#y~~ZvpF|;GjMf`u1f9jYjquwjq1_l&k@6^HfoXC6f12ww@KU8IJY~O6kX!FmQy=& z`3dDcDJ~xj1I5NkO%oUDsW{1BQ~>*Hwv}x4jg6r`;IOmb=#3A%#KKR`c~0+i?WbW` zrVgkjD#yC>&DZf98a&_7gbm(oJ0Q+7OWV2LM`OBDKW}$z&FZ;zb{W+k*)sJIu zoi-uMP)nq(@Qu-zn5_PMaI7W~W4Sz3;NbMXm>& zV0&k*JF1G|n_tAC=_uC`oA}nCeF{srH>kz~Zx}(TyGOKfMEeKe4OAW^oziH{9zmhe zjSJd4ayeL764b;loJ!0Hu9b0D6bJZ{@(xN`fwis?r|CMB)U2)cv(~LkbyOmh%?^pU z-AxkIH;d*MND{Bxl+QQ&1zCNB*5w6#;Z9Tt-m6?)y3xS4oF;5s8ISgD02OOn3JW8k z^@}lHgRPk`3RB#EbE&s+gAo)FgYJJNu91rj3?Qdd6-RqEufVX1u$%u4lY!vd8+&Cl z@|V~-=(2JG$Z|L?ym}m+4lFOpp%i?LJ|A9|$$@xe`NTk?skr^ANDKxeSc7oR)q|#M zX;U$YMS*3e&~W+T1P0nLC=uP!NHm0`cQ{70t?Lz;ysQ{(BGB(uMNO-OJDtkOQMpYU z%%a|pqbcy~Y8y>2V1oNY;b8|NW8y_tamgAPKSS;<0EaDRfa4~9Rw4(_#vaC07$Q66 zrz{>>kFJS`riiA%Zv3*RHq*%{XuJ?ZkruoF5vgH?)WE7w>fNpDZ3!-z)MIQA3fY$Rxe6bmMW3(647s_%k_f5 z1Tw^XT_44pfqD=J!|n2A35V;I!`X!Z71mi_0y3&)^hI!vtexL%8;L@C>yNnYQBi!w z_^b}t&#N5Lr+mtq$sVWQcS)QJ+Jw^hU0v>GsjKxo$$W#Qkg_?X@k-VVejJ)Ak#6r^ z`VX{7kU`@ER1gxyCERp5vP+OM844k}t|D z4(au+!Nkt+j5=q#JkX?J#E%(Y4;w2lttTVGr%>WO&U77)K2_BmCk=AS4voCdaNj^p zSMbJkg{tsSq02(myF231aK1W!D{6Nn%0bzQs`W|hd-&|^^akpvuGh_1%P4wOqAbmV z`>UPHtzdK+VqVfZFy2ru2q&njLrW$L3N^U!t%8D$j9U@Ed~kGB%40%P?WNhcHd(K0 zGN{3mxHdolzlYze^=?9$dH@A~fWEJM=Em;PhJNx^S|6(ue}uUxA@tz5Y+o15)EpEN zWOjdq%c(zvFb;&kI03p%v!FSXy#eG`j-A7qn80YcH6kAD(M?(#?kcJ=0${}? zv)Iz|B_}2L7J$OU+spNg<@vX)oDj~Nn~@WRw^ZleFB+VkueM&HGrlE8(`aX6m4UR2 z&U1bFB_M`e^2g^{{?cV%4_`uxlHr~997G11%(S~74sILXS%7Z4bOx4u>DDNNxPgf;eP066V?zA8|e%C z#$Z|y?FID_$bN@fq>#q!0DM0Z*Nw$Q-F|6i`hxXys6nN^14K_UCsPQeqQr6EkxN1lCVJLOBy*gFgDTqH0 z*?P5}$yaxqGXA~{qs0qTh#b-j^>qty(aCcGQ1Y^3Nq96Orpk)=+9qOIg!zIwQlLcb zsztG*GxO)Sz2gi&nW=+Sz`2)~k2s8}Fk>$1KPyh==ADO2~rMM?n(% z?MvGoIi~yi`lrK}@5Q#U1v~^O9PAy9#ORq7xzO%lTBhk(NkT5*hOyC7ZhE9u#m6n^ zo$pZpOk9~|!ywfkPG5dep`#8?VA{BCq^bdt9(tZ^0YpsTfn(4d&V zI!Hnsd)!OSz@*(W{J5sy4a}U2*}ZVF`Pk4J8Us!>&!8TAeGx*ST~I=w z&g!$PW9C5!;qVcTRiq!9o$|}~3FEVOI7keiiQY6OSJ%Pwz@o=ht$q&CkLjjS6o3~j zH~1W0iAOB*D*G> zy02Bnj%aeAWPyPk*M8PQy8G+#7wwVDgZMO?s4k6kHZ}=qj={_ps8Ha&xHa%uIxOoY zFdXOP^L`z2R%z?tS|3eX9oqwK!2Hx1MyuTO8#rpH85X>s)s+LG73z4+S+at;75Otg zm-?qB?KNefo9>=>&YwkEoOmk7)9iOuM}xl(s zlH#%_FS;@MVR#auoLvWO(%j*omehDgqGh!*y zm>$x5B>SI_Bp;3(!Sw8bmQM?N?%Ynz_YdDKJs1S>FBzss$+Fl{>24OZ-UGh_wDndw zXKeIY2j=Iyaz>s$iL&=&RG6`vd#x=ZN(`SHVc#ZQuBR+{7&Q?rlIpVNM>YF7D)|Z9 z^gFdG9eTKEEc!{7wtRtfRkiJeYT7=2a~rsYOz+d9y}KB%^+5k{B$Wi zIl0l<5i_n;GbG6yK$*RBPr=sLy_VoA$f+l3f6Q3o{GYk}*YWN@(Mfu-k9Yk*@0?Bv&zExIq_)INGzS&8zOI{SWy!C)lyvDK_Zuf~ zYdnMNdxN;mak6sLR>wR<)rXtm?X-Cj7MMQ=!|;`--;JV^OSK=ycuz7!L@(I&HFi+2 zx-KaD*$(A(ALpJXTjzi$!>J3E3{nawUaKd!N@PD~UmhSfL6%E~Wh>HPf--Tfm*sup z$u6^T+ka;EU#|IYW$1q*x%*50t4|N)3OzUy@?RwXo5t^w^iQ?}M;{w$&|sFEmiYo2 znr6#h=UUbY6ps1h7NN3GR5xV}40DA}w6-+B;Xu9Z8oj@jZ4>CrY^4D*TV`6kR_spt10(ylDydM2Z;_RUhC2{>z-wkL}YB1g276PH4l z5tz)yt&vETteA5uo3w!pqF32V^R00vD(nIl4c*VPMSY#9o*9+YzDpbfy;DB)D5c2{ z4f72V#F}*|xeo3--FGlA?anxn((0k(?cEh>%tvfi#iC+5h;YFKM&&Ko`m=zS-Kefe zfo%uf!jx#x6Jv4|ed+G|+CnfndF8RtE(~P@8q9lDP!To79Fq~AvbwzI3>~Bq81Fcv zKVXv*AXikt#Jz)*Eu7Qu4MSUi+@L`mgHYLNACt9i!SN098cd63XNCTH;B-)5L*)aX zrf5<5Z5iI4wLaT#f@*Ks?9FoygoIQnHpDJY0}7sd^qJoE%i*^D2k3? z3@?5Xpv+Ddk4K7<&SD~WpS~k#UAK#EFcn@;oe=SxNDHh2HHOyYxGNe0qEBXtgM_=g zDoT&;HCzb-lQn5rIw@?UYWwQPX15X1%Wc6V}4(_+SJF5ayeU^cSc$0$1IS!}j+ zS{~EbMzb&`ao_2C^QCXk`+E7vj>HR6Q3f0W>u0L*tJCYLl^zTQ1`bC0@MuBtk2d=S z@SmOeBfzhwu|U$_uKmwRpE~zPjbD=%{iXABd;GV_9=+YK@z|mEIR4hm_UC+0+u0t4 zf6YhzceQ^tw>_okX^+-#?dXTg`>#p=r(^4>`qMU}-|CNzE5FtMYC8IFi+<4f*LYmC z|3lXJ;K~1+!k;XSll{&0KmDOkW5nY`zgW8XyV}1+jHftHbK2iH(M128;XXxpdYt(AZsG;BR0{Ia{we?WK=#GZ2T zv?=R1;Ml({=Qq?-l&6g;zfmyYo-XVs%Fi~H|2+!CgAe - insert into email_maintain(dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time) + insert into email_maintain(dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_user, create_time, del_status, modify_time) values - (#{entity.deptId}, #{entity.companyCode}, #{entity.deptName}, #{entity.username}, #{entity.userId}, #{entity.emailAddress}, #{entity.emailPassword}, #{entity.createTime}, #{entity.delStatus}, #{entity.modifyTime}) + (#{entity.deptId}, #{entity.companyCode}, #{entity.deptName}, #{entity.username}, #{entity.userId}, #{entity.emailAddress}, #{entity.emailPassword},#{entity.createUser}, #{entity.createTime}, #{entity.delStatus}, #{entity.modifyTime}) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java index 75e3d695..e7bae17e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java @@ -114,9 +114,4 @@ public class TDxRecordInvoiceDetail implements Serializable { */ private String goodsNum; - /** - * 税码 - */ - private String taxCode; - } diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml index e0fce424..ac9a2335 100644 --- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml @@ -32,7 +32,7 @@