修复重整计划或者和解协议执行功能部分bug

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java

@@ -96,11 +96,11 @@ public class RpeiExeInfoController extends BaseController {
         queryWrapper.eq(RpeiExeInfo::getRegAuth, user.getRegionID().substring(0, 6))
                 .eq(RpeiExeInfo::getExeState, "1");  //只查执行期间的
         if (StringUtils.isNotEmpty(entity.getSearchUscc())) {
-            queryWrapper.eq(RpeiExeInfo::getUniscId, entity.getSearchUscc())
+            queryWrapper.eq(RpeiExeInfo::getUniscid, entity.getSearchUscc())
-                    .or().eq(RpeiExeInfo::getRegNo, entity.getSearchUscc());
+                    .or().eq(RpeiExeInfo::getRegno, entity.getSearchUscc());
         }
         if (StringUtils.isNotEmpty(entity.getEntName())) {
-            queryWrapper.like(RpeiExeInfo::getEntName, entity.getEntName());
+            queryWrapper.like(RpeiExeInfo::getEntname, entity.getEntName());
         }
         Page<RpeiExeInfo> page = new Page<>(query.getCurrent(), query.getSize());
         IPage<RpeiExeInfo> data = rpeiExeInfoService.page(page, queryWrapper);
@@ -122,7 +122,7 @@ public class RpeiExeInfoController extends BaseController {
 
         //判断该企业还有没有没走完的流程
         List<RpeiExeInfoTask> taskList = rpeiExeInfoTaskService.list(new LambdaQueryWrapper<RpeiExeInfoTask>()
-                .eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripId())
+                .eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripid())
                 .in(RpeiExeInfoTask::getStatus, "0", "1", "2"));//还没走完的流程
         if (!taskList.isEmpty()) {
             return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业还有未完成的流程");
@@ -131,7 +131,7 @@ public class RpeiExeInfoController extends BaseController {
         //若是要新增执行流程，需要判断该企业的重整计划或者和解协议是否在执行
         if ("add".equals(operType)) {
             List<RpeiExeInfo> infoList = rpeiExeInfoService.list(new LambdaQueryWrapper<RpeiExeInfo>()
-                    .eq(RpeiExeInfo::getPripId, rpeiExeInfo.getPripId())
+                    .eq(RpeiExeInfo::getPripid, rpeiExeInfo.getPripid())
                     .eq(RpeiExeInfo::getExeState, "1"));//执行状态是1代表还在执行中
             if (!infoList.isEmpty()) {
                 return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业的重整计划或者和解协议尚在执行中");

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java

@@ -41,28 +41,28 @@ public class RpeiExeInfo extends SuperEntity implements Serializable {
      */
     @ApiModelProperty(value = "企业（机构）名称")
     @TableField("ENTNAME")
-    private String entName;
+    private String entname;
 
     /**
      * 主体身份代码
      */
     @ApiModelProperty(value = "主体身份代码")
     @TableField("PRIPID")
-    private String pripId;
+    private String pripid;
 
     /**
      * 统一社会信用代码
      */
     @ApiModelProperty(value = "统一社会信用代码")
     @TableField("UNISCID")
-    private String uniscId;
+    private String uniscid;
 
     /**
      * 注册号
      */
     @ApiModelProperty(value = "注册号")
     @TableField("REGNO")
-    private String regNo;
+    private String regno;
 
     /**
      * 登记机关

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java

@@ -91,7 +91,7 @@ public class RpeiExeInfoTaskServiceImpl extends ServiceImpl<RpeiExeInfoTaskMappe
 
     @Override
     public XrTaskListVo saveIvdAcceptList(RpeiExeInfo rpeiExeInfo, String operType, AICUser user) {
-        EBaseinfo eBaseinfo = baseinfoService.getById(rpeiExeInfo.getPripId());
+        EBaseinfo eBaseinfo = baseinfoService.getById(rpeiExeInfo.getPripid());
         if (eBaseinfo == null) {
             throw new BusinessException("主体信息不存在");
         }

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSSerIllegalListServiceImpl.java

@@ -9,12 +9,15 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.dto.EntWritsDto;
 import com.chinaweal.aiccs.aiccs.query.entity.TSEntBaseQuery;
 import com.chinaweal.aiccs.aiccs.query.mapper.TSEntBaseQueryMapper;
 import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
+import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode;
+import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService;
 import com.chinaweal.aiccs.common.base.entity.dto.task.UniTaskListDto;
 import com.chinaweal.aiccs.aiccs.seriousillegal.mapper.TSSerIllegalListMapper;
 import com.chinaweal.aiccs.aiccs.seriousillegal.service.TSSerIllegalListService;
 import com.chinaweal.aicorg.model.AICUser;
 import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
 import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -36,6 +39,8 @@ public class TSSerIllegalListServiceImpl extends BaseServiceImpl<TSSerIllegalLis
 
     @Resource
     private TSEntBaseQueryMapper tsEntBaseQueryMapper;
+    @Autowired
+    private TRBaseCodeService baseCodeService;
 
     @Override
     public List<TSSerIllegalList> selectEntList(TSSerIllegalList serIllegalListModel) {
@@ -171,7 +176,12 @@ public class TSSerIllegalListServiceImpl extends BaseServiceImpl<TSSerIllegalLis
                     .eq(TSSerIllegalList::getOperationStatus, "0")
                     .isNull(TSSerIllegalList::getRemdate));
             //取企业的第一条严重违法信息
-            records.add(illegals.get(0));
+            TSSerIllegalList tsSerIllegalList = illegals.get(0);
+            // 列入原因
+            Map<String, TRBaseCode> serCodeMap = baseCodeService.getBaseCodeMapFormCache("CD73");
+            TRBaseCode reasonCode = serCodeMap.get(tsSerIllegalList.getSerillrea());
+            tsSerIllegalList.setSerillreaString(reasonCode.getName());
+            records.add(tsSerIllegalList);
         });
 
         xrSeriousIllegalListIPage.setRecords(records);

src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml

@@ -532,14 +532,14 @@
             b.ENTTYPE not in ('9500','9910','9100','9200')
             and exists (select 1 from tsserillegallist s where s.PRIPID = b.PRIPID
             and s.OPERATIONSTATUS = '0' and s.REMDATE is null)
-            <if test="entity.entName != null and entity.entName != ''">
+            <if test="entity.entname != null and entity.entname != ''">
-                and b.ENTNAME = #{entity.entName,jdbcType=VARCHAR}
+                and b.ENTNAME = #{entity.entname,jdbcType=VARCHAR}
             </if>
             <if test="entity.searchUscc != null and entity.searchUscc != ''">
                 and (b.UNISCID = #{entity.searchUscc} or b.REGNO = #{entity.searchUscc})
             </if>
-            <if test="entity.uniscId != null and entity.uniscId != ''">
+            <if test="entity.uniscid != null and entity.uniscid != ''">
-                and (b.UNISCID = #{entity.uniscId} or b.REGNO = #{entity.uniscId})
+                and (b.UNISCID = #{entity.uniscid} or b.REGNO = #{entity.uniscid})
             </if>
             <if test="entity.regorg != null and entity.regorg != ''">
                 and b.REGORG = #{entity.regorg}