diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java index d0a036d7..5f0e571a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java @@ -168,10 +168,10 @@ public class TJwKckb { @Excel(name = "xqbh", width = 15) @ApiModelProperty(value = "xqbh") private java.lang.String xqbh; - /**bh*/ - @Excel(name = "bh", width = 15) - @ApiModelProperty(value = "bh") - private java.lang.String bh; +// /**bh*/ +// @Excel(name = "bh", width = 15) +// @ApiModelProperty(value = "bh") +// private java.lang.String bh; /**jxdgnr*/ @Excel(name = "jxdgnr", width = 15) @ApiModelProperty(value = "jxdgnr") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml index faedead4..5163576a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml @@ -3,7 +3,7 @@ - UPDATE xxhbtkxx tk, ketangbiao kt + UPDATE xxhbtkxx tk, kc_ketangbiao kt SET kt.sftk = tk.tklx, kt.tkyy = tk.tksy, kt.bkjh = tk.bkjh WHERE STR_TO_DATE( tk.skrq, '%Y%m%d' ) = kt.skrq diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java index cdc225ea..1107382f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.kc.grab.imports.service.impl; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -31,6 +32,7 @@ public class XxhbtkxxServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = {Exception.class}) + @InterceptorIgnore(tenantLine = "true") public boolean syncList(Collection entityList, boolean isDelete) { QueryWrapper dqw = new QueryWrapper(); if(isDelete){ @@ -38,15 +40,18 @@ public class XxhbtkxxServiceImpl extends ServiceImpl i } // SQL1:UPDATE xxhbtkxx set jc = replace( convert(jc using ascii),'?', '')【第5-6节 -> 5-6】 UpdateWrapper upw1 = new UpdateWrapper<>(); - upw1.setSql("jc = replace( convert(jc using ascii),'?', '')"); + //upw1.setSql("jc = replace( convert(jc using ascii),'?', '')"); + upw1.set("jc","replace( convert(jc using ascii),'?', '')"); update(upw1); // SQL2:UPDATE xxhbtkxx set jc = replace( jc,'-', '、')【5-6 -> 5、6】 UpdateWrapper upw2 = new UpdateWrapper<>(); - upw2.setSql("jc = replace( jc,'-', '、')"); + //upw2.setSql("jc = replace( jc,'-', '、')"); + upw2.set("jc","replace( jc,'-', '、')"); update(upw2); //将【5、6 -> 05、06】 UpdateWrapper upw3 = new UpdateWrapper<>(); - upw3.setSql("jc = CONCAT("+ + upw3.set("jc", + "CONCAT("+ "CASE"+ "WHEN POSITION( '、' IN jc ) = 2 THEN concat( '0', substr( jc, 1, 1 ), '、' )"+ "WHEN POSITION( '、' IN jc ) = 3 THEN concat( '0', substr( jc, 1, 2 ), '、' )"+