Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java

@@ -47,7 +47,7 @@ public class SystemPDFTemplateRelevanceBizController {
             systemPDFTemplateRelevanceBizService.insert(systemPDFTemplateRelevanceEntity);
         }
 
-        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest);
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceBizEntityList = systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest);
         PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -63,7 +63,4 @@ public class SystemPDFTemplateRelevanceBizController {
     }
 
 
-
-
-
 }

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java

@@ -33,11 +33,11 @@ public class SystemPDFTemplateRelevanceCodeController {
     @PostMapping("/system/pdf/templateRelevanceCode/getListByModelId")
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
-        List<String> ids=new ArrayList<>();
+        List<String> ids = new ArrayList<>();
         FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
         filterBussinessTypeRequest.setEnable(true);
-        List<SysPdfTemplateRelevanceCodeEntity> list=systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest);
-        for (SysPdfTemplateRelevanceCodeEntity obj:list){
+        List<SysPdfTemplateRelevanceCodeEntity> list = systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest);
+        for (SysPdfTemplateRelevanceCodeEntity obj : list) {
             ids.add(obj.getLocalAction());
         }
 
@@ -50,7 +50,7 @@ public class SystemPDFTemplateRelevanceCodeController {
             systemPDFTemplateRelevanceCodeService.insert(systemPDFTemplateRelevanceEntity);
         }
 
-        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest);
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceCodeEntityList = systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest);
         PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -66,7 +66,4 @@ public class SystemPDFTemplateRelevanceCodeController {
     }
 
 
-
-
-
 }

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java

@@ -26,7 +26,7 @@ public class SystemPDFTemplateRelevanceLabelController {
     @PostMapping("/system/pdf/templateRelevanceLabel/getListByModelId")
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
-        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest);
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceLabelEntityList = systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest);
         PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -42,7 +42,4 @@ public class SystemPDFTemplateRelevanceLabelController {
     }
 
 
-
-
-
 }

src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java

@@ -2,6 +2,8 @@ package com.glxp.api.req.system;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class SysParamConfigSaveRequest {
 
@@ -13,4 +15,5 @@ public class SysParamConfigSaveRequest {
     private int paramStatus;
     private int paramType;
     private String paramExplain;
+    private Date updateTime;
 }

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java

@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla
     @Override
     public List<SysPdfTemplateRelevanceBizEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceBizEntity> ew=new QueryWrapper();
-        if(modelId!=null){
-            ew.eq("moduleId",modelId);
+        QueryWrapper<SysPdfTemplateRelevanceBizEntity> ew = new QueryWrapper();
+        if (modelId != null) {
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew);
+        List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntityList = sysPdfTemplateRelevanceBizDao.selectList(ew);
 
         return sysPdfTemplateRelevanceBizEntityList;
     }
@@ -38,21 +38,20 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity);
-
-       if(count>0){
-           return true;
-       }else{
-           return false;
-       }
+        if (count > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) {
-
+        sysPdfTemplateRelevanceBizEntity.setUpdateTime(new Date());
         sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity);
-
         return true;
     }
 

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java

@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl
     @Override
     public List<SysPdfTemplateRelevanceCodeEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper();
-        if(modelId!=null){
-            ew.eq("moduleId",modelId);
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew = new QueryWrapper();
+        if (modelId != null) {
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew);
+        List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntityList = sysPdfTemplateRelevanceCodeDao.selectList(ew);
 
         return sysPdfTemplateRelevanceCodeEntityList;
     }
@@ -39,35 +39,35 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl
     @Override
     public List<SysPdfTemplateRelevanceCodeEntity> selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
-        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper<>();
-        if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){
-            ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey());
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew = new QueryWrapper<>();
+        if (filterPdfTemplateRelevanceRequest.getModelKey() != null) {
+            ew.eq("modelKey", filterPdfTemplateRelevanceRequest.getModelKey());
         }
         return sysPdfTemplateRelevanceCodeDao.selectList(ew);
     }
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity);
-
-       if(count>0){
-           return true;
-       }else{
-           return false;
-       }
+        if (count > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) {
-
+        sysPdfTemplateRelevanceCodeEntity.setUpdateTime(new Date());
         sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity);
         return false;
     }
 
     @Override
     public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) {
-        return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction);
+        return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name, localAction);
     }
 
     @Override

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java

@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp
     @Override
     public List<SysPdfTemplateRelevanceLabelEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceLabelEntity> ew=new QueryWrapper();
-        if(modelId!=null){
-            ew.eq("moduleId",modelId);
+        QueryWrapper<SysPdfTemplateRelevanceLabelEntity> ew = new QueryWrapper();
+        if (modelId != null) {
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew);
+        List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntityList = sysPdfTemplateRelevanceLabelDao.selectList(ew);
 
         return sysPdfTemplateRelevanceLabelEntityList;
     }
@@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity);
-
-       if(count>0){
-           return true;
-       }else{
-           return false;
-       }
+        if (count > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java

@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT
     @Override
     public List<SysPdfTemplateRelevanceStatemenEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceStatemenEntity> ew=new QueryWrapper();
-        if(modelId!=null){
-            ew.eq("moduleId",modelId);
+        QueryWrapper<SysPdfTemplateRelevanceStatemenEntity> ew = new QueryWrapper();
+        if (modelId != null) {
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew);
+        List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntityList = sysPdfTemplateRelevanceStatemenDao.selectList(ew);
 
         return sysPdfTemplateRelevanceStatemenEntityList;
     }
@@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity);
-
-       if(count>0){
-           return true;
-       }else{
-           return false;
-       }
+        if (count > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override

src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java

@@ -70,7 +70,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
 
     @Override
     public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) {
-
+        sysParamConfigSaveRequest.setUpdateTime(new Date());
         return systemParamConfigDao.updateById(sysParamConfigSaveRequest);
     }
 
@@ -82,6 +82,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
 
     @Override
     public boolean insert(SystemParamConfigEntity systemParamConfigEntity) {
+        systemParamConfigEntity.setUpdateTime(new Date());
         return systemParamConfigDao.insert(systemParamConfigEntity);
     }
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java

@@ -151,6 +151,7 @@ public class ThrDeptServiceImpl implements ThrDeptService {
                             thrInvWarehouseEntity.setThirdSysFk(thirdSysFk);
                             thrInvWarehouseEntity.setParentId(response.getCode());
                             thrInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
+                            thrInvWarehouseEntity.setUpdateTime(new Date());
                             thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
                         }
                     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -80,16 +80,19 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
 
     @Override
     public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        thrInvWarehouseEntity.setUpdateTime(new Date());
         return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
     }
 
     @Override
     public boolean insertInvWarehouses(List<ThrInvWarehouseEntity> thrInvWarehouseEntitys) {
+        thrInvWarehouseEntitys.forEach(thrInvWarehouseEntity -> thrInvWarehouseEntity.setUpdateTime(new Date()));
         return thrInvWarehouseDao.insertThrInvWarehouses(thrInvWarehouseEntitys);
     }
 
     @Override
     public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        thrInvWarehouseEntity.setUpdateTime(new Date());
         return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity);
     }
 

src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml

@@ -52,6 +52,7 @@
             <if test="paramStatus != null">paramStatus=#{paramStatus},</if>
             <if test="paramType != null">paramType=#{paramType},</if>
             <if test="paramExplain != null">paramExplain=#{paramExplain},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
         </set>
         WHERE id=#{id}
     </update>
@@ -66,13 +67,14 @@
 
     <insert id="insert" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity">
         insert INTO sys_param_config(paramName,
-                                     paramKey, paramValue, paramStatus, paramType, paramExplain)
+                                     paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime)
         values (#{paramName},
                 #{paramKey},
                 #{paramValue},
                 #{paramStatus},
                 #{paramType},
-                #{paramExplain})
+                #{paramExplain},
+                #{updateTime})
     </insert>
 
     <select id="selectValueByParamKey" resultType="java.lang.String">

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml

@@ -57,21 +57,22 @@
   </select>
 
   <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
-    insert
-    ignore
-        INTO sys_pdf_template_relevance_biz
-        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey)
-        values (#{templateId},
-    #{customerId},
-    #{adminId},
-    #{moduleId},
-    #{localAction},
-    #{remark1},
-    #{remark2},
-    #{remark3},
-    #{printType},
-    #{modelKey}
-)
+      insert
+          ignore
+      INTO sys_pdf_template_relevance_biz
+      (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey,
+       updateTime)
+      values (#{templateId},
+              #{customerId},
+              #{adminId},
+              #{moduleId},
+              #{localAction},
+              #{remark1},
+              #{remark2},
+              #{remark3},
+              #{printType},
+              #{modelKey},
+              #{updateTime})
   </insert>
 
 

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml

@@ -58,7 +58,7 @@
     insert
     ignore
         INTO sys_pdf_template_relevance_code
-        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey)
+        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey,updateTime)
         values (#{templateId},
     #{customerId},
     #{adminId},
@@ -68,7 +68,8 @@
     #{remark2},
     #{remark3},
     #{printType},
-    #{modelKey}
+    #{modelKey},
+    #{updateTime}
     )
   </insert>
 

src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml

@@ -80,27 +80,28 @@
             parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
         replace
         INTO thr_inv_warehouse
-        (id, code, `name`, parentId, remark, thirdSysFk)
+        (id, code, `name`, parentId, remark, thirdSysFk, updateTime)
         values (
         #{id},
         #{code},
         #{name},
         #{parentId},
         #{remark},
-        #{thirdSysFk}
+        #{thirdSysFk},
+        #{updateTime}
         )
     </insert>
 
     <insert id="insertThrInvWarehouses" parameterType="java.util.List">
         replace INTO thr_inv_warehouse
-        (id, code, `name`, parentId, remark, thirdSysFk)
+        (id, code, `name`, parentId, remark, thirdSysFk,updateTime)
         VALUES
         <foreach collection="thrDeptEntities" item="item" index="index"
                  separator=",">
             (
             #{item.id}, #{item.code},
             #{item.name}, #{item.parentId},
-            #{item.remark}, #{item.thirdSysFk})
+            #{item.remark}, #{item.thirdSysFk}, #{item.updateTime})
         </foreach>
     </insert>
 
@@ -118,6 +119,7 @@
             <if test="parentId != null">parentId=#{parentId},</if>
             <if test="remark != null">remark=#{remark},</if>
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
         </trim>
         WHERE id = #{id}
     </update>