报停，销户，过户，恢复调整

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhBtLogController.java

@@ -14,7 +14,9 @@ import com.tofly.feesapi.common.util.GuidGenerator;
 import com.tofly.feesapi.sfgl.mapper.YyQfmxMapper;
 import com.tofly.feesapi.yhgl.entity.YhBtLog;
 import com.tofly.feesapi.yhgl.entity.YhKhjbxx;
+import com.tofly.feesapi.yhgl.entity.Yhkhjbxx2;
 import com.tofly.feesapi.yhgl.mapper.YhBtLogMapper;
+import com.tofly.feesapi.yhgl.mapper.YhKhjbxxMapper;
 import com.tofly.feesapi.yhgl.service.YhBtLogService;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxService;
 import io.netty.util.internal.StringUtil;
@@ -51,6 +53,7 @@ public class YhBtLogController {
     private  final YhBtLogMapper yhBtLogMapper;
 
     private  final YhKhjbxxService yhKhjbxxService;
+    private final YhKhjbxxMapper yhKhjbxxMapper;
 
     private  final YyQfmxMapper yyQfmxMapper;
 
@@ -104,10 +107,14 @@ public class YhBtLogController {
             daBtLog.setBh(GuidGenerator.getGuid().substring(0, 8));
             if (yhBtLogService.save(daBtLog)) {
                 //同步用户档案状态
-                YhKhjbxx daCustomer = new YhKhjbxx();
-                daCustomer.setYhbh(daBtLog.getYhbh());//用户编号
-                daCustomer.setYhzt(YhztEnum.报停用户);
-                if (yhKhjbxxService.updateById(daCustomer)) {
+                Yhkhjbxx2 yhKhjbxx2=yhKhjbxxMapper.selectYhDa(daBtLog.getYhbh());
+                YhKhjbxx yhKhjbxx = new YhKhjbxx();
+                yhKhjbxx.setYhbh(daBtLog.getYhbh());//用户编号
+                yhKhjbxx.setYhzt(YhztEnum.报停用户);
+                yhKhjbxx.setSsgs(String.valueOf(yhKhjbxx2.getSsgs()));
+                yhKhjbxx.setSscbb(String.valueOf(yhKhjbxx2.getSscbb()));
+                yhKhjbxx.setSscbpq(String.valueOf(yhKhjbxx2.getSscbpq()));
+                if (yhKhjbxxService.updateById(yhKhjbxx)) {
                     rest.setCode(1);
                     rest.setMessage("操作成功");
                 } else {

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhGhLogController.java

@@ -15,6 +15,8 @@ import com.tofly.feesapi.sfgl.mapper.YyQfmxMapper;
 import com.tofly.feesapi.yhgl.entity.YhGhLog;
 import com.tofly.feesapi.yhgl.entity.YhHfysLog;
 import com.tofly.feesapi.yhgl.entity.YhKhjbxx;
+import com.tofly.feesapi.yhgl.entity.Yhkhjbxx2;
+import com.tofly.feesapi.yhgl.mapper.YhKhjbxxMapper;
 import com.tofly.feesapi.yhgl.service.YhGhLogService;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxService;
 import lombok.AllArgsConstructor;
@@ -47,6 +49,7 @@ import java.util.Map;
 public class YhGhLogController {
 
     private final YhKhjbxxService yhKhjbxxService;
+    private final YhKhjbxxMapper yhKhjbxxMapper;
     private final  YhGhLogService yhGhLogService;
     private  final YyQfmxMapper yyQfmxMapper;
     /**
@@ -106,10 +109,14 @@ public class YhGhLogController {
             yhGhLog.setGhsj(new Date());//操作时间
             if (yhGhLogService.save(yhGhLog)) {
                 //同步用户档案状态
+                Yhkhjbxx2 yhKhjbxx2=yhKhjbxxMapper.selectYhDa(yhGhLog.getYhbh());
                 YhKhjbxx yhKhjbxx = new YhKhjbxx();
                 yhKhjbxx.setYhbh(yhGhLog.getYhbh());//用户编号
                 yhKhjbxx.setYhxm(yhGhLog.getNewYhxm());//姓名
                 yhKhjbxx.setLxdh(yhGhLog.getNewLxdh());//电话
+                yhKhjbxx.setSsgs(String.valueOf(yhKhjbxx2.getSsgs()));
+                yhKhjbxx.setSscbb(String.valueOf(yhKhjbxx2.getSscbb()));
+                yhKhjbxx.setSscbpq(String.valueOf(yhKhjbxx2.getSscbpq()));
                 if (StringUtils.isNotBlank(yhGhLog.getNewYhdz())) {
                     yhKhjbxx.setYhdz(yhGhLog.getNewYhdz());//地址
                 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhHfysLogController.java

@@ -15,7 +15,9 @@ import com.tofly.feesapi.common.util.GuidGenerator;
 import com.tofly.feesapi.sfgl.mapper.YyQfmxMapper;
 import com.tofly.feesapi.yhgl.entity.YhHfysLog;
 import com.tofly.feesapi.yhgl.entity.YhKhjbxx;
+import com.tofly.feesapi.yhgl.entity.Yhkhjbxx2;
 import com.tofly.feesapi.yhgl.mapper.YhHfysLogMapper;
+import com.tofly.feesapi.yhgl.mapper.YhKhjbxxMapper;
 import com.tofly.feesapi.yhgl.service.YhHfysLogService;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxService;
 import lombok.AllArgsConstructor;
@@ -51,7 +53,7 @@ public class YhHfysLogController {
     private final YhHfysLogService yhHfysLogService;
 
     private final YhHfysLogMapper yhHfysLogMapper;
-
+    private final YhKhjbxxMapper yhKhjbxxMapper;
     private final YhKhjbxxService yhKhjbxxService;
     private  final YyQfmxMapper yyQfmxMapper;
     /**
@@ -109,9 +111,13 @@ public class YhHfysLogController {
             yhHfysLog.setBh(GuidGenerator.getGuid().substring(0, 8));//id
             yhHfysLog.setCzrq(new Date()); //操作时间
             if (yhHfysLogService.save(yhHfysLog)) {
+                Yhkhjbxx2 yhKhjbxx2=yhKhjbxxMapper.selectYhDa(yhHfysLog.getYhbh());
                 YhKhjbxx yhKhjbxx = new YhKhjbxx();
                 yhKhjbxx.setYhbh(yhHfysLog.getYhbh());//用户编号
                 yhKhjbxx.setYhzt(YhztEnum.正式用户);//用户状态
+                yhKhjbxx.setSsgs(String.valueOf(yhKhjbxx2.getSsgs()));
+                yhKhjbxx.setSscbb(String.valueOf(yhKhjbxx2.getSscbb()));
+                yhKhjbxx.setSscbpq(String.valueOf(yhKhjbxx2.getSscbpq()));
                 if (yhKhjbxxService.updateById(yhKhjbxx)) {
                     rest.setCode(1);
                     rest.setMessage("操作成功");

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhhLogController.java

@@ -16,6 +16,8 @@ import com.tofly.feesapi.sfgl.mapper.YyQfmxMapper;
 import com.tofly.feesapi.yhgl.entity.YhHfysLog;
 import com.tofly.feesapi.yhgl.entity.YhKhjbxx;
 import com.tofly.feesapi.yhgl.entity.YhhLog;
+import com.tofly.feesapi.yhgl.entity.Yhkhjbxx2;
+import com.tofly.feesapi.yhgl.mapper.YhKhjbxxMapper;
 import com.tofly.feesapi.yhgl.mapper.YhhLogMapper;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxService;
 import com.tofly.feesapi.yhgl.service.YhhLogService;
@@ -48,7 +50,7 @@ public class YhhLogController {
 
     private final  YhhLogService yhhLogService;
     private final YhhLogMapper yhhLogMapper;
-
+    private final YhKhjbxxMapper yhKhjbxxMapper;
     private final YhKhjbxxService yhKhjbxxService;
     private  final YyQfmxMapper yyQfmxMapper;
     /**
@@ -108,9 +110,13 @@ public class YhhLogController {
 
             if (yhhLogService.save(yhhLog)) {
                 //同步用户档案状态
+                Yhkhjbxx2 yhKhjbxx2=yhKhjbxxMapper.selectYhDa(yhhLog.getYhbh());
                 YhKhjbxx yhKhjbxx = new YhKhjbxx();
                 yhKhjbxx.setYhbh(yhhLog.getYhbh());//用户编号
                 yhKhjbxx.setYhzt(YhztEnum.销户用户);
+                yhKhjbxx.setSsgs(String.valueOf(yhKhjbxx2.getSsgs()));
+                yhKhjbxx.setSscbb(String.valueOf(yhKhjbxx2.getSscbb()));
+                yhKhjbxx.setSscbpq(String.valueOf(yhKhjbxx2.getSscbpq()));
                 if (yhKhjbxxService.updateById(yhKhjbxx)) {
                     rest.setCode(1);
                     rest.setMessage("操作成功");

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/entity/Yhkhjbxx2.java

@@ -27,15 +27,12 @@ public class Yhkhjbxx2 implements Serializable {
     private String ykhbh;
 
     @ApiModelProperty("所属公司")
-    @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
     private int ssgs;
 
     @ApiModelProperty("所属抄表片区")
-    @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
     private int sscbpq;
 
     @ApiModelProperty("所属抄表本")
-    @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
     private int sscbb;
 
     @ApiModelProperty("申请日期")

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/mapper/YhKhjbxxMapper.java

@@ -27,6 +27,7 @@ public interface YhKhjbxxMapper extends BaseMapper<YhKhjbxx> {
 
     //查询用户基本信息YhKhjbxx
      Yhkhjbxx2 selectYhDa(String yhbh);
+
     //查询最大用户编号
      int selectMaxYhbh();
     //查询用户是否存在

collect-fees/collect-fees-api/src/main/resources/mapper/yhgl/YhKhjbxxMapper.xml

@@ -32,7 +32,6 @@
     <select id="selectYhDa" resultType="com.tofly.feesapi.yhgl.entity.Yhkhjbxx2">
         select * from  yh_khjbxx  where yhbh=#{yhbh}
     </select>
-
     <sql id="querySql">
         SELECT  a.yhbh,a.ykhbh, a.yhxm,a.yhdz,a.lxdh, a.ssgs,a.sscbpq,a.sscbb,a.xb,a.sj,a.zzdh,a.gzdw,a.bgdh, a.dzyx,a.zjlb,a.zjhm,a.sqrq,
         a.jdrq,a.yhzt,a.rks,a.hzgx,a.zsjb,a.tsbz,a.tsrq,a.htqd,a.htqdrq,a.htbh,a.bz,a.bz_gcbh,a.bz_pcxlh,a.czrybm,a.czryxm,