bug修改

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java

@@ -5,6 +5,8 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.annotation.DataPermission;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery;
 import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
 import com.mortals.xhx.module.device.model.DeviceEntity;
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.mortals.framework.ap.SysConstains.*;
+import static java.util.stream.Collectors.toMap;
 
 import com.mortals.xhx.common.code.*;
 
@@ -49,6 +52,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
 
     @Autowired
     private CertificateDocumentService certificateDocumentService;
+    @Autowired
+    private UserService userService;
 
     public ChildLicenseController() {
         super.setModuleDesc("行业许可子证");
@@ -62,6 +67,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
         this.addDict(model, "deleted", DeletedEnum.getEnumMap());
         this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery())
                 .stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDocumentName(), (o, n) -> n)));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }
 

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

@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
 import lombok.Data;
 /**
-* 证照申请实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 证照申请实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-31
+ */
 @Data
 public class ApplyLogEntity extends ApplyLogVo {
     private static final long serialVersionUID = 1L;
@@ -152,6 +152,14 @@ public class ApplyLogEntity extends ApplyLogVo {
      * 制证机关
      */
     private String authority;
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件地址
+     */
+    private String annexUrl;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -202,5 +210,7 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.businessPlace = "";
         this.licenseProject = "";
         this.authority = "";
+        this.annexName = "";
+        this.annexUrl = "";
     }
 }
\ No newline at end of file

one-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 2024-07-28
-*/
+ * 证照申请查询对象
+ *
+ * @author zxfei
+ * @date 2024-07-31
+ */
 public class ApplyLogQuery extends ApplyLogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -315,6 +315,16 @@ public class ApplyLogQuery extends ApplyLogEntity {
 
     /** 制证机关排除列表 */
     private List <String> authorityNotList;
+    /** 附件名称 */
+    private List<String> annexNameList;
+
+    /** 附件名称排除列表 */
+    private List <String> annexNameNotList;
+    /** 附件地址 */
+    private List<String> annexUrlList;
+
+    /** 附件地址排除列表 */
+    private List <String> annexUrlNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<ApplyLogQuery> orConditionList;
 
@@ -2078,6 +2088,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
         this.authorityNotList = authorityNotList;
     }
 
+    /**
+     * 获取 附件名称
+     * @return annexNameList
+     */
+    public List<String> getAnnexNameList(){
+        return this.annexNameList;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameList
+     */
+    public void setAnnexNameList(List<String> annexNameList){
+        this.annexNameList = annexNameList;
+    }
+
+    /**
+     * 获取 附件名称
+     * @return annexNameNotList
+     */
+    public List<String> getAnnexNameNotList(){
+        return this.annexNameNotList;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameNotList
+     */
+    public void setAnnexNameNotList(List<String> annexNameNotList){
+        this.annexNameNotList = annexNameNotList;
+    }
+
+    /**
+     * 获取 附件地址
+     * @return annexUrlList
+     */
+    public List<String> getAnnexUrlList(){
+        return this.annexUrlList;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlList
+     */
+    public void setAnnexUrlList(List<String> annexUrlList){
+        this.annexUrlList = annexUrlList;
+    }
+
+    /**
+     * 获取 附件地址
+     * @return annexUrlNotList
+     */
+    public List<String> getAnnexUrlNotList(){
+        return this.annexUrlNotList;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlNotList
+     */
+    public void setAnnexUrlNotList(List<String> annexUrlNotList){
+        this.annexUrlNotList = annexUrlNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -3095,6 +3169,44 @@ public class ApplyLogQuery extends ApplyLogEntity {
         return this;
     }
 
+
+    /**
+     * 设置 附件名称
+     * @param annexName
+     */
+    public ApplyLogQuery annexName(String annexName){
+        setAnnexName(annexName);
+        return this;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameList
+     */
+    public ApplyLogQuery annexNameList(List<String> annexNameList){
+        this.annexNameList = annexNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 附件地址
+     * @param annexUrl
+     */
+    public ApplyLogQuery annexUrl(String annexUrl){
+        setAnnexUrl(annexUrl);
+        return this;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlList
+     */
+    public ApplyLogQuery annexUrlList(List<String> annexUrlList){
+        this.annexUrlList = annexUrlList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

@@ -9,6 +9,8 @@ import com.mortals.framework.utils.poi.ExcelUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.ImportExcelUtil;
 import com.mortals.xhx.common.utils.ReadExcelPictureUtil;
@@ -39,6 +41,8 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
+import static java.util.stream.Collectors.toMap;
+
 /**
 *
 * 证照申请
@@ -55,6 +59,8 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
 
     @Autowired
     private CertificateDocumentService certificateDocumentService;
+    @Autowired
+    private UserService userService;
 
     public ApplyLogController(){
         super.setModuleDesc( "证照申请");
@@ -66,6 +72,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
         this.addDict(model,"holderType", IBaseEnum.getEnumMap(HolderType.class));
         this.addDict(model,"holderIdType", IBaseEnum.getEnumMap(HolderIdType.class));
         this.addDict(model,"generateStatus", IBaseEnum.getEnumMap(GenerateStatus.class));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }
 

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintLogController.java

@@ -4,6 +4,8 @@ import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.PrintStatus;
 import com.mortals.xhx.common.code.StatusEnum;
 import com.mortals.xhx.module.record.model.PrintLogEntity;
@@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+
+import static java.util.stream.Collectors.toMap;
+
 /**
 *
 * 证照打印记录
@@ -26,6 +31,8 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PrintLogController(){
         super.setModuleDesc( "证照打印记录");
@@ -35,6 +42,7 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class));
         this.addDict(model,"printStatus", IBaseEnum.getEnumMap(PrintStatus.class));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }
 

one-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">
 
     <!-- 字段和属性映射 -->
@@ -43,6 +43,8 @@
         <result property="businessPlace" column="businessPlace" />
         <result property="licenseProject" column="licenseProject" />
         <result property="authority" column="authority" />
+        <result property="annexName" column="annexName" />
+        <result property="annexUrl" column="annexUrl" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -162,23 +164,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))">
                 a.authority,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexName') or colPickMode == 1 and data.containsKey('annexName')))">
+                a.annexName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexUrl') or colPickMode == 1 and data.containsKey('annexUrl')))">
+                a.annexUrl,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="ApplyLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_apply_log
-        (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority)
+        (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,annexName,annexUrl)
         VALUES
-        (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{mobile},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{legalPerson},#{socialCode},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{recordStatus},#{qRCode},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority})
+        (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{mobile},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{legalPerson},#{socialCode},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{recordStatus},#{qRCode},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority},#{annexName},#{annexUrl})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_apply_log
-        (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority)
+        (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,annexName,annexUrl)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.mobile},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.recordStatus},#{item.qRCode},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority})
+            (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.mobile},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.recordStatus},#{item.qRCode},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority},#{item.annexName},#{item.annexUrl})
         </foreach>
     </insert>
 
@@ -329,6 +337,12 @@
             <if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))">
                 a.authority=#{data.authority},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('annexName')) or (colPickMode==1 and !data.containsKey('annexName'))">
+                a.annexName=#{data.annexName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('annexUrl')) or (colPickMode==1 and !data.containsKey('annexUrl'))">
+                a.annexUrl=#{data.annexUrl},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -650,6 +664,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="annexName=(case" suffix="ELSE annexName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('annexName')) or (colPickMode==1 and !item.containsKey('annexName'))">
+                        when a.id=#{item.id} then #{item.annexName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="annexUrl=(case" suffix="ELSE annexUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('annexUrl')) or (colPickMode==1 and !item.containsKey('annexUrl'))">
+                        when a.id=#{item.id} then #{item.annexUrl}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1604,6 +1632,48 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('annexName')">
+            <if test="conditionParamRef.annexName != null and conditionParamRef.annexName != ''">
+                ${_conditionType_} a.annexName like #{${_conditionParam_}.annexName}
+            </if>
+            <if test="conditionParamRef.annexName == null">
+                ${_conditionType_} a.annexName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('annexNameList') and conditionParamRef.annexNameList.size() > 0">
+            ${_conditionType_} a.annexName in
+            <foreach collection="conditionParamRef.annexNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('annexNameNotList') and conditionParamRef.annexNameNotList.size() > 0">
+            ${_conditionType_} a.annexName not in
+            <foreach collection="conditionParamRef.annexNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('annexUrl')">
+            <if test="conditionParamRef.annexUrl != null and conditionParamRef.annexUrl != ''">
+                ${_conditionType_} a.annexUrl like #{${_conditionParam_}.annexUrl}
+            </if>
+            <if test="conditionParamRef.annexUrl == null">
+                ${_conditionType_} a.annexUrl is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('annexUrlList') and conditionParamRef.annexUrlList.size() > 0">
+            ${_conditionType_} a.annexUrl in
+            <foreach collection="conditionParamRef.annexUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('annexUrlNotList') and conditionParamRef.annexUrlNotList.size() > 0">
+            ${_conditionType_} a.annexUrl not in
+            <foreach collection="conditionParamRef.annexUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1961,6 +2031,16 @@
                     <if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('annexName')">
+                    a.annexName
+                    <if test='orderCol.annexName != null and "DESC".equalsIgnoreCase(orderCol.annexName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('annexUrl')">
+                    a.annexUrl
+                    <if test='orderCol.annexUrl != null and "DESC".equalsIgnoreCase(orderCol.annexUrl)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>