测试bug修改

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
 /**
-* 证照申请实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照申请实体对象
+ *
+ * @author zxfei
+ * @date 2022-11-07
+ */
 
 public class ApplyLogEntity extends ApplyLogVo {
     private static final long serialVersionUID = 1L;
@@ -109,6 +109,10 @@ public class ApplyLogEntity extends ApplyLogVo {
      * 档案操作类型1新增2变更
      */
     private Integer operType;
+    /**
+     * 归档状态0否1是
+     */
+    private Integer recordStatus;
 
 
 
@@ -435,6 +439,20 @@ public class ApplyLogEntity extends ApplyLogVo {
     public void setOperType(Integer operType){
         this.operType = operType;
     }
+    /**
+     * 获取 归档状态0否1是
+     * @return Integer
+     */
+    public Integer getRecordStatus(){
+        return recordStatus;
+    }
+    /**
+     * 设置 归档状态0否1是
+     * @param recordStatus
+     */
+    public void setRecordStatus(Integer recordStatus){
+        this.recordStatus = recordStatus;
+    }
 
 
 
@@ -480,6 +498,7 @@ public class ApplyLogEntity extends ApplyLogVo {
         sb.append(",formTemplate:").append(getFormTemplate());
         sb.append(",generateStatus:").append(getGenerateStatus());
         sb.append(",operType:").append(getOperType());
+        sb.append(",recordStatus:").append(getRecordStatus());
         return sb.toString();
     }
 
@@ -530,5 +549,7 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.generateStatus = 1;
 
         this.operType = 1;
+
+        this.recordStatus = 0;
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.record.model.ApplyLogEntity;
 /**
-* 证照申请查询对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照申请查询对象
+ *
+ * @author zxfei
+ * @date 2022-11-07
+ */
 public class ApplyLogQuery extends ApplyLogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -190,6 +190,18 @@ public class ApplyLogQuery extends ApplyLogEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 归档状态0否1是 */
+    private Integer recordStatusStart;
+
+    /** 结束 归档状态0否1是 */
+    private Integer recordStatusEnd;
+
+    /** 增加 归档状态0否1是 */
+    private Integer recordStatusIncrement;
+
+    /** 归档状态0否1是列表 */
+    private List <Integer> recordStatusList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<ApplyLogQuery> orConditionList;
 
@@ -1144,6 +1156,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 归档状态0否1是
+     * @return recordStatusStart
+     */
+    public Integer getRecordStatusStart(){
+        return this.recordStatusStart;
+    }
+
+    /**
+     * 设置 开始 归档状态0否1是
+     * @param recordStatusStart
+     */
+    public void setRecordStatusStart(Integer recordStatusStart){
+        this.recordStatusStart = recordStatusStart;
+    }
+
+    /**
+     * 获取 结束 归档状态0否1是
+     * @return $recordStatusEnd
+     */
+    public Integer getRecordStatusEnd(){
+        return this.recordStatusEnd;
+    }
+
+    /**
+     * 设置 结束 归档状态0否1是
+     * @param recordStatusEnd
+     */
+    public void setRecordStatusEnd(Integer recordStatusEnd){
+        this.recordStatusEnd = recordStatusEnd;
+    }
+
+    /**
+     * 获取 增加 归档状态0否1是
+     * @return recordStatusIncrement
+     */
+    public Integer getRecordStatusIncrement(){
+        return this.recordStatusIncrement;
+    }
+
+    /**
+     * 设置 增加 归档状态0否1是
+     * @param recordStatusIncrement
+     */
+    public void setRecordStatusIncrement(Integer recordStatusIncrement){
+        this.recordStatusIncrement = recordStatusIncrement;
+    }
+
+    /**
+     * 获取 归档状态0否1是
+     * @return recordStatusList
+     */
+    public List<Integer> getRecordStatusList(){
+        return this.recordStatusList;
+    }
+
+    /**
+     * 设置 归档状态0否1是
+     * @param recordStatusList
+     */
+    public void setRecordStatusList(List<Integer> recordStatusList){
+        this.recordStatusList = recordStatusList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1820,6 +1896,51 @@ public class ApplyLogQuery extends ApplyLogEntity {
     }
 
 
+    /**
+     * 设置  归档状态0否1是
+     * @param recordStatus
+     */
+    public ApplyLogQuery recordStatus(Integer recordStatus){
+        setRecordStatus(recordStatus);
+        return this;
+    }
+
+    /**
+     * 设置 开始 归档状态0否1是
+     * @param recordStatusStart
+     */
+    public ApplyLogQuery recordStatusStart(Integer recordStatusStart){
+        this.recordStatusStart = recordStatusStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 归档状态0否1是
+     * @param recordStatusEnd
+     */
+    public ApplyLogQuery recordStatusEnd(Integer recordStatusEnd){
+        this.recordStatusEnd = recordStatusEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 归档状态0否1是
+     * @param recordStatusIncrement
+     */
+    public ApplyLogQuery recordStatusIncrement(Integer recordStatusIncrement){
+        this.recordStatusIncrement = recordStatusIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 归档状态0否1是
+     * @param recordStatusList
+     */
+    public ApplyLogQuery recordStatusList(List<Integer> recordStatusList){
+        this.recordStatusList = recordStatusList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java

@@ -44,6 +44,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.record.dao.ApplyLogDao;
 import com.mortals.xhx.module.record.model.ApplyLogEntity;
 import com.mortals.xhx.module.record.service.ApplyLogService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -95,6 +96,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
             orConditionList.add(condition2);
             query.setOrConditionList(orConditionList);
         }
+        query.setRecordStatus(YesNoEnum.NO.getValue());
         return query;
     }
 
@@ -151,20 +153,21 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void generateOriginal(ApplyLogEntity applyLogEntity, Context context) throws AppException {
         validData(applyLogEntity,context);
         Long oldId = null;
-        boolean delete = false;
+        boolean is_record = false;
         CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
         applyLogEntity.setCatalogCode(catalog.getCatalogCode());
         applyLogEntity.setCatalogName(catalog.getCatalogName());
-        applyLogEntity.setFormTemplate(catalog.getFormContent());
         DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateUrl(),applyLogEntity.getFormContent());
         String paths = preview(docTemplate, context);
         String[] vals = paths.split(";");
         applyLogEntity.setCertificateUrl(vals[0]);
         applyLogEntity.setPreviewUrl(vals[1]);
         applyLogEntity.setCreateTime(new Date());
+        applyLogEntity.setRecordStatus(YesNoEnum.NO.getValue());
         if(context!=null && context.getUser()!=null) {
             applyLogEntity.setCreateUserId(context.getUser().getId());
         }
@@ -172,7 +175,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
         if(applyLogEntity.getId()!=null && applyLogEntity.getRecordId()!=null){
             applyLogEntity.setOperType(OperTypeEnum.UPDATE.getValue());
             oldId = applyLogEntity.getId();
-            delete = true;
+            is_record = true;
             RecordEntity recordEntity = new RecordEntity();
             recordEntity.setId(applyLogEntity.getRecordId());
             recordEntity.setUpdateUserId(applyLogEntity.getCreateUserId());
@@ -191,8 +194,12 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
             applyLogEntity.setRecordId(recordEntity.getId());
         }
         dao.insert(applyLogEntity);
-        if(delete){
-            dao.delete(oldId);
+        if(is_record){
+            ApplyLogEntity updata = new ApplyLogEntity();
+            updata.setId(oldId);
+            updata.setRecordStatus(YesNoEnum.YES.getValue());
+            updata.setUpdateTime(new Date());
+            dao.update(updata);
         }
         printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
     }

certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -33,6 +33,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="recordStatus" column="recordStatus" />
 
     </resultMap>
 
@@ -124,23 +125,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordStatus') or colPickMode == 1 and data.containsKey('recordStatus')))">
+                a.recordStatus,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="ApplyLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_apply_log
-        (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime)
+        (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus)
         VALUES
-        (#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{recordStatus})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_apply_log
-        (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime)
+        (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.recordStatus})
         </foreach>
     </insert>
 
@@ -255,6 +259,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('recordStatus')) or (colPickMode==1 and !data.containsKey('recordStatus'))">
+                a.recordStatus=#{data.recordStatus},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('recordStatusIncrement')) or (colPickMode==1 and !data.containsKey('recordStatusIncrement'))">
+                a.recordStatus=ifnull(a.recordStatus,0) + #{data.recordStatusIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -496,6 +506,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="recordStatus=(case" suffix="ELSE recordStatus end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('recordStatus')) or (colPickMode==1 and !item.containsKey('recordStatus'))">
+                            when a.id=#{item.id} then #{item.recordStatus}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('recordStatusIncrement')) or (colPickMode==1 and !item.containsKey('recordStatusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.recordStatus,0) + #{item.recordStatusIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1071,6 +1093,27 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+        <if test="conditionParamRef.containsKey('recordStatus')">
+            <if test="conditionParamRef.recordStatus != null ">
+                ${_conditionType_} a.recordStatus = #{${_conditionParam_}.recordStatus}
+            </if>
+            <if test="conditionParamRef.recordStatus == null">
+                ${_conditionType_} a.recordStatus is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('recordStatusList')">
+            ${_conditionType_} a.recordStatus in
+            <foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null">
+            ${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('recordStatusEnd') and conditionParamRef.recordStatusEnd != null">
+            ${_conditionType_} a.recordStatus <![CDATA[ <= ]]> #{${_conditionParam_}.recordStatusEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1224,6 +1267,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('recordStatus')">
+                    a.recordStatus
+                    <if test='orderCol.recordStatus != null and "DESC".equalsIgnoreCase(orderCol.recordStatus)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>