添加事项备注字段

base-manager/db/add.sql

@@ -322,3 +322,10 @@ CREATE TABLE `mortals_sys_matter_channel`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_matterId`(`matterId`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '办理渠道';
+
+
+
+-- ----------------------------
+-- 2025-3-19
+-- ----------------------------
+ALTER TABLE mortals_sys_matter ADD COLUMN `remark` varchar(512)      COMMENT '备注信息';
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -35,7 +35,7 @@ public class SyncTreeSiteThread implements Runnable {
     public void run() {
 
         try {
-            Thread.sleep(5000);
+            Thread.sleep(3000);
         } catch (InterruptedException e) {
         }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java

@@ -331,14 +331,13 @@ public class MatterEntity extends MatterVo {
     /**
      * 事项扩展信息
      */
-    private List<MatterExtEntity> matterExtList=new ArrayList<>();;
-    public List<MatterExtEntity> getMatterExtList(){
-        return matterExtList;
-    }
 
-    public void setMatterExtList(List<MatterExtEntity> matterExtList){
-        this.matterExtList = matterExtList;
-    }
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+    private List<MatterExtEntity> matterExtList=new ArrayList<>();;
     @Override
     public int hashCode() {
         return Objects.hash(this.areaCode, this.matterNo);
@@ -509,5 +508,6 @@ public class MatterEntity extends MatterVo {
         this.netApplyUrl = "";
         this.areaName = "";
         this.areaLevel = 0;
+        this.remark="";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
  * 基础事项查询对象
  *
  * @author zxfei
- * @date 2025-03-17
+ * @date 2025-03-19
  */
 public class MatterQuery extends MatterEntity {
     /** 开始 序号，主键，自增长 */
@@ -510,6 +510,11 @@ public class MatterQuery extends MatterEntity {
     /** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)排除列表 */
     private List <Integer> areaLevelNotList;
 
+    /** 备注信息 */
+    private List<String> remarkList;
+
+    /** 备注信息排除列表 */
+    private List <String> remarkNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<MatterQuery> orConditionList;
 
@@ -3551,6 +3556,38 @@ public class MatterQuery extends MatterEntity {
     }
 
 
+    /**
+     * 获取 备注信息
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+     * 获取 备注信息
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -5333,6 +5370,25 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+
+    /**
+     * 设置 备注信息
+     * @param remark
+     */
+    public MatterQuery remark(String remark){
+        setRemark(remark);
+        return this;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkList
+     */
+    public MatterQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -125,6 +125,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     private BusinessMatterService businessMatterService;
     @Autowired
     private AreaService areaService;
+    @Autowired
+    private MatterChannelService matterChannelService;
 
 
     @Override
@@ -134,7 +136,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             if (!ObjectUtils.isEmpty(entity.getSiteId())) {
                 SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
                 entity.setAreaCode(siteEntity.getAreaCode());
-                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode()+"_"+entity.getSiteId());
+                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode() + "_" + entity.getSiteId());
                 entity.setDeptName(extCache == null ? "" : extCache.getName());
             }
 
@@ -178,6 +180,82 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             siteThemeMatterService.save(siteThemeMatterEntity, context);
         }
 
+        if (!ObjectUtils.isEmpty(entity.getMatterAcceptList())) {
+            entity.getMatterAcceptList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setMatterCode(entity.getMatterNo());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterAcceptService.save(entity.getMatterAcceptList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterDatumList())) {
+            entity.getMatterDatumList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+
+            for (MatterDatumEntity matterDatumEntity : entity.getMatterDatumList()) {
+                matterDatumService.save(matterDatumEntity);
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterChannelList())) {
+            entity.getMatterChannelList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterChannelService.save(entity.getMatterChannelList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterChargesList())) {
+            entity.getMatterChargesList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterChargesService.save(entity.getMatterChargesList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterFlowlimitList())) {
+            entity.getMatterFlowlimitList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterFlowlimitService.save(entity.getMatterFlowlimitList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterIntermediaryList())) {
+            entity.getMatterIntermediaryList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterIntermediaryService.save(entity.getMatterIntermediaryList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterQuestionList())) {
+            entity.getMatterQuestionList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterQuestionService.save(entity.getMatterQuestionList());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getMatterSetbaseList())) {
+            entity.getMatterSetbaseList().stream().peek(item -> {
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            matterSetbaseService.save(entity.getMatterSetbaseList());
+        }
+
 
         super.saveAfter(entity, context);
     }
@@ -189,7 +267,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             if (!ObjectUtils.isEmpty(entity.getSiteId())) {
                 SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
                 entity.setAreaCode(siteEntity.getAreaCode());
-                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode()+"_"+entity.getSiteId());
+                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode() + "_" + entity.getSiteId());
                 entity.setDeptName(extCache == null ? "" : extCache.getName());
             }
             MatterEntity beforeMatterEntity = this.get(entity.getId(), context);
@@ -200,7 +278,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     SiteMatterQuery condition = new SiteMatterQuery();
                     condition.setMatterId(entity.getId());
                     SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
-                    DeptEntity extCache = deptService.getExtCache(entity.getDeptCode()+"_"+entity.getSiteId());
+                    DeptEntity extCache = deptService.getExtCache(entity.getDeptCode() + "_" + entity.getSiteId());
 
                     siteMatterQuery.setDeptId(extCache == null ? 0L : extCache.getId());
                     siteMatterQuery.setDeptCode(entity.getDeptCode());
@@ -267,6 +345,116 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         };
         ThreadPool.getInstance().execute(runnable);
 
+        if(!ObjectUtils.isEmpty(entity.getMatterAcceptList())){
+            Long[] ids = matterAcceptService.find(new MatterAcceptQuery().matterId(entity.getId())).stream().map(MatterAcceptEntity::getId).toArray(Long[]::new);
+            matterAcceptService.remove(ids,context);
+            entity.getMatterAcceptList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterAcceptService.save(entity.getMatterAcceptList());
+        }
+
+
+        if(!ObjectUtils.isEmpty(entity.getMatterDatumList())){
+            Long[] ids = matterDatumService.find(new MatterDatumQuery().matterId(entity.getId())).stream().map(MatterDatumEntity::getId).toArray(Long[]::new);
+            matterDatumService.remove(ids,context);
+            entity.getMatterDatumList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            for (MatterDatumEntity matterDatumEntity : entity.getMatterDatumList()) {
+                matterDatumService.save(matterDatumEntity);
+            }
+        }
+
+
+        if(!ObjectUtils.isEmpty(entity.getMatterChannelList())){
+            Long[] ids = matterChannelService.find(new MatterChannelQuery().matterId(entity.getId())).stream().map(MatterChannelEntity::getId).toArray(Long[]::new);
+            matterChannelService.remove(ids,context);
+            entity.getMatterChannelList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterChannelService.save(entity.getMatterChannelList());
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getMatterChargesList())){
+            Long[] ids = matterChargesService.find(new MatterChargesQuery().matterId(entity.getId())).stream().map(MatterChargesEntity::getId).toArray(Long[]::new);
+            matterChargesService.remove(ids,context);
+            entity.getMatterChargesList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterChargesService.save(entity.getMatterChargesList());
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getMatterFlowlimitList())){
+            Long[] ids = matterFlowlimitService.find(new MatterFlowlimitQuery().matterId(entity.getId())).stream().map(MatterFlowlimitEntity::getId).toArray(Long[]::new);
+            matterFlowlimitService.remove(ids,context);
+            entity.getMatterFlowlimitList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterFlowlimitService.save(entity.getMatterFlowlimitList());
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getMatterIntermediaryList())){
+            Long[] ids = matterIntermediaryService.find(new MatterIntermediaryQuery().matterId(entity.getId())).stream().map(MatterIntermediaryEntity::getId).toArray(Long[]::new);
+            matterIntermediaryService.remove(ids,context);
+            entity.getMatterIntermediaryList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterIntermediaryService.save(entity.getMatterIntermediaryList());
+        }
+
+
+        if(!ObjectUtils.isEmpty(entity.getMatterQuestionList())){
+            Long[] ids = matterQuestionService.find(new MatterQuestionQuery().matterId(entity.getId())).stream().map(MatterQuestionEntity::getId).toArray(Long[]::new);
+            matterQuestionService.remove(ids,context);
+            entity.getMatterQuestionList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterQuestionService.save(entity.getMatterQuestionList());
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getMatterSetbaseList())){
+            Long[] ids = matterSetbaseService.find(new MatterSetbaseQuery().matterId(entity.getId())).stream().map(MatterSetbaseEntity::getId).toArray(Long[]::new);
+            matterSetbaseService.remove(ids,context);
+            entity.getMatterSetbaseList().stream().peek(item ->{
+                item.setMatterId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            matterSetbaseService.save(entity.getMatterSetbaseList());
+        }
+
+
 
         super.updateAfter(entity, context);
     }
@@ -335,7 +523,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Override
     public Rest<SiteMatterEntity> switchMatterToSiteMatter(MatterEntity item, SiteEntity siteEntity, Context context) {
         try {
-            DeptEntity deptEntity = deptService.getExtCache(item.getDeptCode()+"_"+item.getSiteId());
+            DeptEntity deptEntity = deptService.getExtCache(item.getDeptCode() + "_" + item.getSiteId());
             SiteMatterEntity siteMatterEntity = new SiteMatterEntity();
             siteMatterEntity.initAttrValue();
             //SiteEntity siteEntity = siteService.get(siteId);
@@ -1133,7 +1321,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
                 // log.info("更新详细事项==>{},id===>{},localVersion===>{},newVersion==>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition(), matterEditionRemote);
                 //更新部门信息
-                DeptEntity extCache =deptService.selectOne(new DeptQuery().deptNumber(matterEntity.getDeptCode()));
+                DeptEntity extCache = deptService.selectOne(new DeptQuery().deptNumber(matterEntity.getDeptCode()));
                 // DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
                 matterEntity.setDeptName(extCache == null ? "" : extCache.getName());
                 //构建基础信息参数

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -198,6 +198,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Override
     protected int infoAfter(Long id, Map<String, Object> model, MatterEntity entity, Context context) throws AppException {
 
+        if (!ObjectUtils.isEmpty(entity)) {
             List<MatterAcceptEntity> matterAcceptEntities = matterAcceptService.find(new MatterAcceptQuery().matterId(entity.getId()));
             entity.setMatterAcceptList(matterAcceptEntities);
 
@@ -221,8 +222,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
 
             List<MatterSetbaseEntity> matterSetbaseEntities = matterSetbaseService.find(new MatterSetbaseQuery().matterId(entity.getId()));
             entity.setMatterSetbaseList(matterSetbaseEntities);
-
-
+        }
         return super.infoAfter(id, model, entity, context);
     }
 

base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml

@@ -86,6 +86,7 @@
         <result property="netApplyUrl" column="netApplyUrl" />
         <result property="areaName" column="areaName" />
         <result property="areaLevel" column="areaLevel" />
+        <result property="remark" column="remark" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -334,6 +335,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaLevel') or colPickMode == 1 and data.containsKey('areaLevel')))">
                 a.areaLevel,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </if>
         </trim>
     </sql>
     <!-- 子表所有列 -->
@@ -345,18 +349,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="MatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel,remark)
         VALUES
-        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime},#{deptName},#{evaluationUrl},#{netApplyUrl},#{areaName},#{areaLevel})
+        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime},#{deptName},#{evaluationUrl},#{netApplyUrl},#{areaName},#{areaLevel},#{remark})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel,remark)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.deptName},#{item.evaluationUrl},#{item.netApplyUrl},#{item.areaName},#{item.areaLevel})
+            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.deptName},#{item.evaluationUrl},#{item.netApplyUrl},#{item.areaName},#{item.areaLevel},#{item.remark})
         </foreach>
     </insert>
 
@@ -630,6 +634,9 @@
             <if test="(colPickMode==0 and data.containsKey('areaLevelIncrement')) or (colPickMode==1 and !data.containsKey('areaLevelIncrement'))">
                 a.areaLevel=ifnull(a.areaLevel,0) + #{data.areaLevelIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -1242,6 +1249,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -3094,6 +3108,27 @@
             ${_conditionType_} a.areaLevel <![CDATA[ <= ]]> #{${_conditionParam_}.areaLevelEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+            </if>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+            ${_conditionType_} a.remark not in
+            <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -3638,6 +3673,11 @@
                     <if test='orderCol.areaLevel != null and "DESC".equalsIgnoreCase(orderCol.areaLevel)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -146,7 +146,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":73
+  "id":72
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -297,4 +297,7 @@ Content-Type: application/json
 {}
 
 
+###cest
+GET http://61.157.227.62:11072/basics_api/base/matter/interinfo?id=1571
+