Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java

@@ -85,6 +85,8 @@ public class SyncDataSetController {
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
+
+        //todo 请立即同步至UDI管理系统
         return ResultVOUtils.success();
     }
 }

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

@@ -0,0 +1,69 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
+import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.BasicBusTypeChangeResponse;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.basic.IBasicBusTypeChangeService;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@RestController
+public class SystemPDFTemplateRelevanceBizController {
+
+    @Resource
+    SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService;
+
+    @Resource
+    IBasicBussinessTypeService basicBussinessTypeService;
+
+    @Resource
+    IBasicBusTypeChangeService basicBusTypeChangeService;
+
+
+    @PostMapping("/system/pdf/templateRelevanceBiz/getListByModelId")
+    public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
+
+        FilterBusTypeChangeRequest filterBussinessTypeRequest = new FilterBusTypeChangeRequest();
+        filterBussinessTypeRequest.setEnable(true);
+        List<BasicBusTypeChangeResponse> bussinessLocalTypeEntities = basicBusTypeChangeService.filterList(filterBussinessTypeRequest);
+        for (BasicBusTypeChangeResponse basicBussinessTypeEntity : bussinessLocalTypeEntities) {
+            SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity = new SysPdfTemplateRelevanceBizEntity();
+            systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getOriginAction());
+            systemPDFTemplateRelevanceEntity.setModuleId(filterPdfTemplateRelevanceRequest.getModuleId());
+            systemPDFTemplateRelevanceEntity.setModelKey(filterPdfTemplateRelevanceRequest.getModelKey());
+            systemPDFTemplateRelevanceBizService.insert(systemPDFTemplateRelevanceEntity);
+        }
+
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest);
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList);
+        PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(sysPdfTemplateRelevanceBizEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/system/pdf/templateRelevanceBiz/updateRl")
+    public BaseResponse updateRl(@RequestBody SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) {
+        systemPDFTemplateRelevanceBizService.udpateRl(sysPdfTemplateRelevanceBizEntity);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,72 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
+import com.glxp.api.req.basic.FilterBussinessTypeRequest;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RestController
+public class SystemPDFTemplateRelevanceCodeController {
+
+    @Resource
+    SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
+
+    @Resource
+    IBasicBussinessTypeService basicBussinessTypeService;
+
+
+    @PostMapping("/system/pdf/templateRelevanceCode/getListByModelId")
+    public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
+
+        List<String> ids=new ArrayList<>();
+        FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
+        filterBussinessTypeRequest.setEnable(true);
+        List<SysPdfTemplateRelevanceCodeEntity> list=systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest);
+        for (SysPdfTemplateRelevanceCodeEntity obj:list){
+            ids.add(obj.getLocalAction());
+        }
+
+        List<BasicBussinessTypeEntity> bussinessLocalTypeEntities = basicBussinessTypeService.selectbyNotAction(ids);
+        for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) {
+            SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity = new SysPdfTemplateRelevanceCodeEntity();
+            systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction());
+            systemPDFTemplateRelevanceEntity.setModuleId(filterPdfTemplateRelevanceRequest.getModuleId());
+            systemPDFTemplateRelevanceEntity.setModelKey(filterPdfTemplateRelevanceRequest.getModelKey());
+            systemPDFTemplateRelevanceCodeService.insert(systemPDFTemplateRelevanceEntity);
+        }
+
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest);
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList);
+        PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(sysPdfTemplateRelevanceCodeEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/system/pdf/templateRelevanceCode/updateRl")
+    public BaseResponse updateRl(@RequestBody SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) {
+        systemPDFTemplateRelevanceCodeService.udpateRl(sysPdfTemplateRelevanceCodeEntity);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@RestController
+public class SystemPDFTemplateRelevanceLabelController {
+
+    @Resource
+    SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService;
+
+
+    @PostMapping("/system/pdf/templateRelevanceLabel/getListByModelId")
+    public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
+
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest);
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList);
+        PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(sysPdfTemplateRelevanceLabelEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/system/pdf/templateRelevanceLabel/updateRl")
+    public BaseResponse updateRl(@RequestBody SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity) {
+        systemPDFTemplateRelevanceLabelService.udpateRl(sysPdfTemplateRelevanceLabelEntity);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@RestController
+public class SystemPDFTemplateRelevanceStatemenController {
+
+    @Resource
+    SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService;
+
+
+    @PostMapping("/system/pdf/templateRelevanceStatement/getListByModelId")
+    public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
+
+        List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceStatemenEntityList= systemPDFTemplateRelevanceStatemenService.filterList(filterPdfTemplateRelevanceRequest);
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceStatemenEntityList);
+        PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(sysPdfTemplateRelevanceStatemenEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/system/pdf/templateRelevanceStatement/updateRl")
+    public BaseResponse updateRl(@RequestBody SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity) {
+        systemPDFTemplateRelevanceStatemenService.udpateRl(sysPdfTemplateRelevanceStatemenEntity);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+
+
+
+}

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SysPdfTemplateRelevanceBizDao extends BaseMapper<SysPdfTemplateRelevanceBizEntity> {
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
+}

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java

@@ -0,0 +1,21 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper<SysPdfTemplateRelevanceCodeEntity> {
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean upInsert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
+
+    SysPdfTemplateRelevanceCodeEntity selectNameAndAction(@Param("name") String name, @Param("localAction") String localAction);
+
+
+
+}

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java

@@ -0,0 +1,13 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SysPdfTemplateRelevanceLabelDao extends BaseMapper<SysPdfTemplateRelevanceLabelEntity> {
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+}

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java

@@ -0,0 +1,14 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper<SysPdfTemplateRelevanceStatemenEntity> {
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+}

src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java

@@ -16,6 +16,8 @@ public interface SystemPDFModuleDao {
 
     SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest);
 
+    SystemPDFModuleEntity findSystemPDFModuleByKey(FilterPdfModuleRequest filterPDFModuleRequest);
+
     SystemPDFModuleEntity selectById(String id);
 
     boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest);

src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java

@@ -0,0 +1,62 @@
+package com.glxp.api.entity.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+    * PDF用户对应表
+    */
+@Data
+@TableName(value = "sys_pdf_template_relevance_biz")
+public class SysPdfTemplateRelevanceBizEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 模板 id
+     */
+    @TableField(value = "`templateId`")
+    private Integer templateId;
+
+    /**
+     * 自定义ID
+     */
+    @TableField(value = "`customerId`")
+    private Long customerId;
+
+    /**
+     * 用户 id
+     */
+    @TableField(value = "`adminId`")
+    private Integer adminId;
+
+    /**
+     * 模块ID
+     */
+    @TableField(value = "`moduleId`")
+    private Integer moduleId;
+
+    /**
+     * 业务单据ID
+     */
+    @TableField(value = "`localAction`")
+    private String localAction;
+
+    @TableField(value = "`remark1`")
+    private String remark1;
+
+    @TableField(value = "`remark2`")
+    private String remark2;
+
+    @TableField(value = "`remark3`")
+    private String remark3;
+
+    @TableField(value = "`printType`")
+    private Byte printType;
+
+    @TableField(value = "`modelKey`")
+    private String modelKey;
+}

src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java

@@ -0,0 +1,63 @@
+package com.glxp.api.entity.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+    * PDF用户对应表
+    */
+@Data
+@TableName(value = "sys_pdf_template_relevance_code")
+public class SysPdfTemplateRelevanceCodeEntity {
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+    * 模板 id
+    */
+    @TableField(value = "`templateId`")
+    private Integer templateId;
+
+    /**
+    * 自定义ID
+    */
+    @TableField(value = "`customerId`")
+    private Long customerId;
+
+    /**
+    * 用户 id
+    */
+    @TableField(value = "`adminId`")
+    private Integer adminId;
+
+    /**
+    * 模块ID
+    */
+    @TableField(value = "`moduleId`")
+    private Integer moduleId;
+
+    /**
+    * 业务单据ID
+    */
+    @TableField(value = "`localAction`")
+    private String localAction;
+
+    @TableField(value = "`remark1`")
+    private String remark1;
+
+    @TableField(value = "`remark2`")
+    private String remark2;
+
+    @TableField(value = "`remark3`")
+    private String remark3;
+
+    @TableField(value = "`printType`")
+    private Byte printType;
+
+    @TableField(value = "`modelKey`")
+    private String modelKey;
+}

src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java

@@ -0,0 +1,62 @@
+package com.glxp.api.entity.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+    * PDF用户对应表
+    */
+@Data
+@TableName(value = "sys_pdf_template_relevance_label")
+public class SysPdfTemplateRelevanceLabelEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 模板 id
+     */
+    @TableField(value = "`templateId`")
+    private Integer templateId;
+
+    /**
+     * 自定义ID
+     */
+    @TableField(value = "`customerId`")
+    private Long customerId;
+
+    /**
+     * 用户 id
+     */
+    @TableField(value = "`adminId`")
+    private Integer adminId;
+
+    /**
+     * 模块ID
+     */
+    @TableField(value = "`moduleId`")
+    private Integer moduleId;
+
+    /**
+     * 业务单据ID
+     */
+    @TableField(value = "`localAction`")
+    private String localAction;
+
+    @TableField(value = "`remark1`")
+    private String remark1;
+
+    @TableField(value = "`remark2`")
+    private String remark2;
+
+    @TableField(value = "`remark3`")
+    private String remark3;
+
+    @TableField(value = "`printType`")
+    private Byte printType;
+
+    @TableField(value = "`modelKey`")
+    private String modelKey;
+}

src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java

@@ -0,0 +1,65 @@
+package com.glxp.api.entity.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+    * PDF用户对应表
+    */
+@Data
+@TableName(value = "sys_pdf_template_relevance_statemen")
+public class SysPdfTemplateRelevanceStatemenEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 模板 id
+     */
+    @TableField(value = "`templateId`")
+    private Integer templateId;
+
+    /**
+     * 自定义ID
+     */
+    @TableField(value = "`customerId`")
+    private Long customerId;
+
+    /**
+     * 用户 id
+     */
+    @TableField(value = "`adminId`")
+    private Integer adminId;
+
+    /**
+     * 模块ID
+     */
+    @TableField(value = "`moduleId`")
+    private Integer moduleId;
+
+    /**
+     * 业务单据ID
+     */
+    @TableField(value = "`localAction`")
+    private String localAction;
+
+    @TableField(value = "`remark1`")
+    private String remark1;
+
+    @TableField(value = "`remark2`")
+    private String remark2;
+
+    @TableField(value = "`remark3`")
+    private String remark3;
+
+    /**
+     * 打印方式：0：批次号打印，1：条码清单打印
+     */
+    @TableField(value = "`printType`")
+    private Byte printType;
+
+    @TableField(value = "`modelKey`")
+    private String modelKey;
+}

src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java

@@ -20,4 +20,5 @@ public class SystemPDFModuleEntity {
     private String remark1;
     private String remark2;
     private String remark3;
+    private String modelKey;
 }

src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java

@@ -40,7 +40,6 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.idc.service.IdcService;
 import com.glxp.api.idc.utils.DBAUtils;
 import com.glxp.api.idc.utils.IDCUtils;
-import com.glxp.api.idc.utils.TableUtils;
 import com.glxp.api.req.system.ScheduledRequest;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.CustomUtil;
@@ -203,7 +202,7 @@ public class IdcServiceImpl implements IdcService {
         }
     }
 
-    
+
     private void fetchFailFile(String host) {
         Map<String,Object> map = new HashMap<String,Object>();
         map.put("sql", "select * from idc_file where createTime<date_sub(now(),interval 30 minute) order by createTime");
@@ -225,7 +224,7 @@ public class IdcServiceImpl implements IdcService {
                 /*未发送重新发送*/
                 asyncFailTask(map.get("syncIp").toString());
             }
-           
+
             String[] syncTables = TableUtils.syncTables();
             for (int i = 0; i < syncTables.length; i++) {
                 String[] tnames = syncTables[i].split("/");
@@ -241,10 +240,10 @@ public class IdcServiceImpl implements IdcService {
         }
     }
 
-    
+
     /*上传失败重新上传*/
     private void asyncFailTask(String host) {
-        try 
+        try
         {
             String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
             String sql = "select * from basic_export_status where status='1' and receiveStatus='0' where updateTime<date_sub(now(),interval 6 minute) order by updateTime";
@@ -302,10 +301,10 @@ public class IdcServiceImpl implements IdcService {
                 }
             }
         } catch (Exception ex) {
-            
+
         }
     }
-   
+
     /*数据删除同步*/
     private void asyncDelete(String tname,boolean isUpload,String syncIp) {
         String[] tnames = tname.split("/");
@@ -354,7 +353,7 @@ public class IdcServiceImpl implements IdcService {
                        try {
                            result = relay("", JSON.toJSONString(msg), null, syncIp);
                        } catch (Exception ex) {
-        
+
                        }
                        if (IDCUtils.isJson(result)) {
                            JSONObject json = JSON.parseObject(result);
@@ -362,14 +361,14 @@ public class IdcServiceImpl implements IdcService {
                                saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
                            } else {
                                success = false;
-        
+
                                saveIdcLog(tnames[9], "", tnames[2] + ">" + result, i * limit, total);
                            }
                        } else {
                            success = false;
                            saveIdcLog(tnames[9], "", syncIp + ":" + tnames[2] + ">fail:上传地址未连通", i * limit, total);
                        }
-        
+
                    } else {
                        saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
                    }
@@ -716,7 +715,7 @@ public class IdcServiceImpl implements IdcService {
 
         Map<String, Object> whereParams = new HashMap<String, Object>();
         whereParams.put("sqlWhere", params.get("sqlWhere"));
-        
+
         String dataWhere  = params.get("dataWhere")!=null ? params.get("dataWhere").toString() : "";
         Map<String, Object> map = new HashMap<String, Object>();
         String where = DBAUtils.convertWhere(column, whereParams, dataWhere);
@@ -951,7 +950,7 @@ public class IdcServiceImpl implements IdcService {
     private boolean analyToDB(String host, String tableName, String uniqueColumn, String
             filePathColumn, List<Map<String, Object>> list, boolean isUpload) {
 
-        
+
         String tName = DBAUtils.tableRealName(tableName);
         String sql = "replace " + tName + "(";
         String del = "delete from " + tName + " where ";
@@ -1184,27 +1183,27 @@ public class IdcServiceImpl implements IdcService {
             int total = 0;
             if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
                 try (InputStream inputStream = result.body().byteStream()) {
-                   
-                        
-    
+
+
+
                         FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
-    
+
                         byte b[] = new byte[1024];
-    
+
                         int len = 0;
                         while ((len = inputStream.read(b)) != -1) {
                             total += len;
                             outputStream.write(b, 0, len);
-    
+
                         }
-    
+
                         outputStream.flush();
                         outputStream.close();
                         if(!(total>0)) {
                             new File(filePath + filePathSlash + imagePath+fileName).delete();
                             executeSql("delete from idc_file where filePath='"+fileName+"'");
                         }
-                
+
                 } catch (Exception e) {
 
 
@@ -1403,7 +1402,7 @@ public class IdcServiceImpl implements IdcService {
 
     }
 
-    
+
     private void executeSql(String sql) {
         try {
             jdbcTemplate.execute(sql);
@@ -1414,4 +1413,4 @@ public class IdcServiceImpl implements IdcService {
     }
 
 
-}
+}

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

@@ -19,4 +19,5 @@ public class FilterPdfModuleRequest extends ListPageRequest {
     private Date create_time;
     private Integer templateType;
     private Date update_time;
+    private String modelKey;
 }

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

@@ -8,4 +8,5 @@ public class FilterPdfTemplateRelevanceRequest extends ListPageRequest {
     private Integer moduleId;
     private Integer templateType;
     private String localAction;
+    private String modelKey;
 }

src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java

@@ -0,0 +1,14 @@
+package com.glxp.api.res.sync;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BaseSyncResponse {
+
+    private String taskId;
+    private List<String> files;
+    private String updateTime;
+
+}

src/main/java/com/glxp/api/res/sync/SpsSyncBusOrderResponse.java

@@ -6,10 +6,10 @@ import lombok.Data;
 
 import java.util.List;
 
+//同步业务单据相关
 @Data
-public class SpsSyncBusOrderResponse {
+public class SpsSyncBusOrderResponse extends BaseSyncResponse {
 
-    private String taskId;
     private List<PurOrderEntity> purOrderEntities;
     private List<PurOrderDetailEntity> purOrderDetailEntities;
 

src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java

@@ -8,11 +8,10 @@ import lombok.Data;
 
 import java.util.List;
 
+//同步单据类型相关
 @Data
-public class SpsSyncBusResponse {
+public class SpsSyncBusResponse extends BaseSyncResponse {
 
-    //同步任务ID
-    private String taskId;
     private List<BasicBussinessTypeEntity> bussinessTypeEntities;
     private List<BasicBusTypeChangeEntity> busTypeChangeEntities;
     private List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities;

src/main/java/com/glxp/api/res/sync/SpsSyncConfigResponse.java

@@ -0,0 +1,30 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBusTypePreEntity;
+import com.glxp.api.entity.basic.EntrustReceEntity;
+import com.glxp.api.entity.system.SystemPDFModuleEntity;
+import com.glxp.api.entity.system.SystemPDFTemplateEntity;
+import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
+import com.glxp.api.entity.system.SystemParamConfigEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncConfigResponse extends BaseSyncResponse {
+
+    SystemParamConfigEntity systemParamConfigEntity;
+    List<EntrustReceEntity> entrustReceEntities;
+
+    //    模板相关
+    List<SystemPDFModuleEntity> systemPDFModuleEntityList;
+    List<SystemPDFTemplateEntity> systemPDFTemplateEntities;
+    List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntities;
+//    List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities;
+//    List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities;
+//    List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities;
+
+    List<BasicBusTypePreEntity> basicBusTypePreEntities;
+    List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities;
+}

src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java

@@ -5,11 +5,10 @@ import lombok.Data;
 
 import java.util.List;
 
+//同步用户信息相关
 @Data
-public class SpsSyncDataResponse {
+public class SpsSyncDataResponse extends BaseSyncResponse {
 
-    //同步任务ID
-    private String taskId;
 
     //用户信息
     List<AuthAdmin> authAdminList;

src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java

@@ -4,12 +4,10 @@ import com.glxp.api.entity.inout.*;
 import lombok.Data;
 
 import java.util.List;
-
+//同步扫码单据相关
 @Data
-public class SpsSyncOrderResponse {
+public class SpsSyncOrderResponse extends BaseSyncResponse {
 
-    //同步任务ID
-    private String taskId;
     List<IoOrderEntity> orderEntities;
     List<IoCodeEntity> codeEntities;
     List<IoOrderDetailBizEntity> orderDetailBizEntities;

src/main/java/com/glxp/api/res/system/SystemPDFModuleResponse.java

@@ -18,4 +18,5 @@ public class SystemPDFModuleResponse {
     private String templateDlUrl;
     private String templateName;
     private Integer templateType;
+    private String modelKey;
 }

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -318,6 +318,12 @@ public class HeartService {
         basicExportService.updateExportStatus(basicExportStatusEntity3);
         return ResultVOUtils.success();
     }
+
+    //    上传系统参数设置
+    public BaseResponse uploadAllConfig(String syncTime) {
+        return null;
+    }
+
 //
 //    //上传最近更新第三方基础数据
 //    public BaseResponse uploadThirdData(String syncTime) {

src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java

@@ -0,0 +1,23 @@
+package com.glxp.api.service.system;
+
+
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SystemPDFTemplateRelevanceBizService {
+
+    List<SysPdfTemplateRelevanceBizEntity> getListByModelId(Integer modelId);
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean udpateRl(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
+
+    boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
+
+
+
+
+}

src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java

@@ -0,0 +1,28 @@
+package com.glxp.api.service.system;
+
+
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SystemPDFTemplateRelevanceCodeService {
+
+    List<SysPdfTemplateRelevanceCodeEntity> getListByModelId(Integer modelId);
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    List<SysPdfTemplateRelevanceCodeEntity> selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest);
+
+    boolean udpateRl(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
+
+    boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
+
+    SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name,String localAction);
+
+
+
+
+
+}

src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java

@@ -0,0 +1,21 @@
+package com.glxp.api.service.system;
+
+
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SystemPDFTemplateRelevanceLabelService {
+
+    List<SysPdfTemplateRelevanceLabelEntity> getListByModelId(Integer modelId);
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean udpateRl(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity);
+
+
+
+
+}

src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java

@@ -0,0 +1,21 @@
+package com.glxp.api.service.system;
+
+
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+
+import java.util.List;
+
+public interface SystemPDFTemplateRelevanceStatemenService {
+
+    List<SysPdfTemplateRelevanceStatemenEntity> getListByModelId(Integer modelId);
+
+    List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity);
+
+
+
+
+}

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

@@ -0,0 +1,57 @@
+package com.glxp.api.service.system.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTemplateRelevanceBizService {
+
+    @Resource
+    SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao;
+
+
+    @Override
+    public List<SysPdfTemplateRelevanceBizEntity> getListByModelId(Integer modelId) {
+
+        QueryWrapper<SysPdfTemplateRelevanceBizEntity> ew=new QueryWrapper();
+        if(modelId!=null){
+            ew.eq("moduleId",modelId);
+        }
+        List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew);
+
+        return sysPdfTemplateRelevanceBizEntityList;
+    }
+
+    @Override
+    public List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) {
+        return sysPdfTemplateRelevanceBizDao.filterList(systemPDFModuleRequest);
+    }
+
+    @Override
+    public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) {
+
+       int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity);
+
+       if(count>0){
+           return true;
+       }else{
+           return false;
+       }
+    }
+
+    @Override
+    public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) {
+
+        sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity);
+
+        return true;
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.glxp.api.service.system.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTemplateRelevanceCodeService {
+
+    @Resource
+    SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao;
+
+
+    @Override
+    public List<SysPdfTemplateRelevanceCodeEntity> getListByModelId(Integer modelId) {
+
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper();
+        if(modelId!=null){
+            ew.eq("moduleId",modelId);
+        }
+        List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew);
+
+        return sysPdfTemplateRelevanceCodeEntityList;
+    }
+
+    @Override
+    public List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) {
+        return sysPdfTemplateRelevanceCodeDao.filterList(systemPDFModuleRequest);
+    }
+
+    @Override
+    public List<SysPdfTemplateRelevanceCodeEntity> selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
+
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper<>();
+        if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){
+            ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey());
+        }
+        return sysPdfTemplateRelevanceCodeDao.selectList(ew);
+    }
+
+    @Override
+    public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) {
+
+       int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity);
+
+       if(count>0){
+           return true;
+       }else{
+           return false;
+       }
+    }
+
+    @Override
+    public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) {
+
+        sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity);
+        return false;
+    }
+
+    @Override
+    public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) {
+        return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction);
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.glxp.api.service.system.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemplateRelevanceLabelService {
+
+    @Resource
+    SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao;
+
+
+    @Override
+    public List<SysPdfTemplateRelevanceLabelEntity> getListByModelId(Integer modelId) {
+
+        QueryWrapper<SysPdfTemplateRelevanceLabelEntity> ew=new QueryWrapper();
+        if(modelId!=null){
+            ew.eq("moduleId",modelId);
+        }
+        List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew);
+
+        return sysPdfTemplateRelevanceLabelEntityList;
+    }
+
+    @Override
+    public List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) {
+        return sysPdfTemplateRelevanceLabelDao.filterList(systemPDFModuleRequest);
+    }
+
+    @Override
+    public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) {
+
+       int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity);
+
+       if(count>0){
+           return true;
+       }else{
+           return false;
+       }
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.glxp.api.service.system.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
+import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
+import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFTemplateRelevanceStatemenService {
+
+    @Resource
+    SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao;
+
+
+    @Override
+    public List<SysPdfTemplateRelevanceStatemenEntity> getListByModelId(Integer modelId) {
+
+        QueryWrapper<SysPdfTemplateRelevanceStatemenEntity> ew=new QueryWrapper();
+        if(modelId!=null){
+            ew.eq("moduleId",modelId);
+        }
+        List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew);
+
+        return sysPdfTemplateRelevanceStatemenEntityList;
+    }
+
+    @Override
+    public List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) {
+        return sysPdfTemplateRelevanceStatemenDao.filterList(systemPDFModuleRequest);
+    }
+
+    @Override
+    public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) {
+
+       int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity);
+
+       if(count>0){
+           return true;
+       }else{
+           return false;
+       }
+    }
+}

src/main/java/com/glxp/api/upload/DownloadController.java

@@ -90,5 +90,27 @@ public class DownloadController {
             }
         }
     }
+    @GetMapping(value = "/udiwms/donwload/printFile")
+    public void printFile(HttpServletResponse response, @RequestParam String fileName) throws IOException {
 
+        String url="D:\\udi\\udiwms\\udiwmsfile\\pdf\\template\\"+fileName;
+        OutputStream os = null;
+        try {
+            FileInputStream input = new FileInputStream(new File(url));
+            OutputStream out = response.getOutputStream();
+            byte[] b = new byte[2048];
+            int len;
+            while ((len = input.read(b)) != -1) {
+                out.write(b, 0, len);
+            }
+            input.close();
+        } catch (IOException e) {
+
+        } finally {
+            if (os != null) {
+                os.flush();
+                os.close();
+            }
+        }
+    }
 }

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

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
+    <!--@mbg.generated-->
+    <!--@Table sys_pdf_template_relevance_biz-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+    <result column="printType" jdbcType="TINYINT" property="printType" />
+    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+    printType, modelKey
+  </sql>
+
+
+  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+    SELECT
+    basic_bustype_change.`originName` localActionName,
+    sys_pdf_template_relevance_biz.id,
+    basic_bustype_change.originAction localAction,
+    templateId,
+    moduleId,
+    sys_pdf_template.NAME templateName,
+    sys_pdf_template_relevance_biz.remark1,
+    sys_pdf_template_relevance_biz.remark2,
+    sys_pdf_template_relevance_biz.remark3,
+    printType
+    FROM
+    basic_bustype_change
+    LEFT JOIN sys_pdf_template_relevance_biz ON basic_bustype_change.originAction = sys_pdf_template_relevance_biz.localAction
+    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_biz.templateId = sys_pdf_template.id
+    <where>
+      <if test="moduleId != null">
+        AND `moduleId` = #{moduleId}
+      </if>
+      <if test="localAction != null">
+        AND sys_pdf_template_relevance_biz.`localAction` = #{localAction}
+      </if>
+      <if test="templateType != null">
+        AND sys_pdf_template_relevance_biz.`templateType` = #{templateType}
+      </if>
+      <if test="modelKey != null">
+        AND sys_pdf_template_relevance_biz.`modelKey` = #{modelKey}
+      </if>
+    </where>
+  </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>
+
+
+</mapper>

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+    <!--@mbg.generated-->
+    <!--@Table sys_pdf_template_relevance_code-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+    <result column="printType" jdbcType="TINYINT" property="printType" />
+    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+    printType, modelKey
+  </sql>
+
+
+  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+    select basic_bussiness_type.`name` localActionName,
+    sys_pdf_template_relevance_code.id,
+    basic_bussiness_type.action localAction,
+    templateId,
+    moduleId,
+    sys_pdf_template.name       templateName,
+    sys_pdf_template_relevance_code.remark1,
+    sys_pdf_template_relevance_code.remark2,
+    sys_pdf_template_relevance_code.remark3,
+    printType
+    from basic_bussiness_type
+    LEFT JOIN sys_pdf_template_relevance_code  on basic_bussiness_type.action = sys_pdf_template_relevance_code.localAction
+    LEFT JOIN sys_pdf_template on sys_pdf_template_relevance_code.templateId = sys_pdf_template.id
+    <where>
+      <if test="moduleId != null">
+        AND `moduleId` = #{moduleId}
+      </if>
+      <if test="localAction != null">
+        AND sys_pdf_template_relevance_code.`localAction` = #{localAction}
+      </if>
+      <if test="templateType != null">
+        AND sys_pdf_template_relevance_code.`templateType` = #{templateType}
+      </if>
+      <if test="modelKey != null">
+        AND sys_pdf_template_relevance_code.`modelKey` = #{modelKey}
+      </if>
+    </where>
+  </select>
+
+  <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+    insert
+    ignore
+        INTO sys_pdf_template_relevance_code
+        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey)
+        values (#{templateId},
+    #{customerId},
+    #{adminId},
+    #{moduleId},
+    #{localAction},
+    #{remark1},
+    #{remark2},
+    #{remark3},
+    #{printType},
+    #{modelKey}
+    )
+  </insert>
+
+  <select id="selectNameAndAction" resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+    SELECT *
+    FROM sys_pdf_template_relevance_code
+    <where>
+      <if test="name != null">
+        AND `modelKey` = #{name}
+      </if>
+      <if test="localAction != null">
+        AND `localAction` = #{localAction}
+      </if>
+    </where>
+  </select>
+
+
+</mapper>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
+    <!--@mbg.generated-->
+    <!--@Table sys_pdf_template_relevance_label-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+    <result column="printType" jdbcType="TINYINT" property="printType" />
+    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+    printType, modelKey
+  </sql>
+
+  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+    SELECT
+    sys_pdf_template_relevance_label.id,
+    sys_pdf_template_relevance_label.localAction localActionName,
+    templateId,
+    moduleId,
+    sys_pdf_template.NAME templateName,
+    sys_pdf_template_relevance_label.remark1,
+    sys_pdf_template_relevance_label.remark2,
+    sys_pdf_template_relevance_label.remark3,
+    printType
+    FROM
+    sys_pdf_template_relevance_label
+    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_label.templateId = sys_pdf_template.id
+    <where>
+      <if test="moduleId != null">
+        AND `moduleId` = #{moduleId}
+      </if>
+      <if test="localAction != null">
+        AND sys_pdf_template_relevance_label.`localAction` = #{localAction}
+      </if>
+      <if test="templateType != null">
+        AND sys_pdf_template_relevance_label.`templateType` = #{templateType}
+      </if>
+      <if test="modelKey != null">
+        AND sys_pdf_template_relevance_label.`modelKey` = #{modelKey}
+      </if>
+    </where>
+  </select>
+
+</mapper>

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
+    <!--@mbg.generated-->
+    <!--@Table sys_pdf_template_relevance_statemen-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+    <result column="printType" jdbcType="TINYINT" property="printType" />
+    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+    printType, modelKey
+  </sql>
+
+
+  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+    SELECT
+    sys_pdf_template_relevance_statemen.id,
+    sys_pdf_template_relevance_statemen.localAction localActionName,
+    templateId,
+    moduleId,
+    sys_pdf_template.NAME templateName,
+    sys_pdf_template_relevance_statemen.remark1,
+    sys_pdf_template_relevance_statemen.remark2,
+    sys_pdf_template_relevance_statemen.remark3,
+    printType
+    FROM
+    sys_pdf_template_relevance_statemen
+    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_statemen.templateId = sys_pdf_template.id
+    <where>
+      <if test="moduleId != null">
+        AND `moduleId` = #{moduleId}
+      </if>
+      <if test="localAction != null">
+        AND sys_pdf_template_relevance_statemen.`localAction` = #{localAction}
+      </if>
+      <if test="templateType != null">
+        AND sys_pdf_template_relevance_statemen.`templateType` = #{templateType}
+      </if>
+      <if test="modelKey != null">
+        AND sys_pdf_template_relevance_statemen.`modelKey` = #{modelKey}
+      </if>
+    </where>
+  </select>
+
+</mapper>

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

@@ -6,15 +6,21 @@
     <select id="queryPage" parameterType="com.glxp.api.req.system.FilterPdfModuleRequest"
             resultType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         SELECT id,name,param,fieldExplain,remark,templateId,create_time,update_time,templateDlUrl,templateType
-        ,remark1,remark2,remark3
+        ,remark1,remark2,remark3,modelKey
         FROM sys_pdf_module
         <where>
             <if test="templateId != null and '' != templateId">
                 AND `templateId` LIKE CONCAT(#{templateId},'%')
             </if>
+            <if test="modelKey != null and '' != modelKey">
+                AND `modelKey` LIKE CONCAT(#{modelKey},'%')
+            </if>
             <if test="name != null and '' != name">
                 AND `name` LIKE CONCAT('%',#{name},'%')
             </if>
+            <if test="templateType != null">
+                AND templateType=#{templateType}
+            </if>
         </where>
     </select>
 
@@ -25,6 +31,13 @@
         WHERE id = #{id}
     </select>
 
+    <select id="findSystemPDFModuleByKey" parameterType="com.glxp.api.req.system.FilterPdfModuleRequest"
+            resultType="com.glxp.api.entity.system.SystemPDFModuleEntity">
+        SELECT *
+        FROM sys_pdf_module
+        WHERE modelKey = #{modelKey}
+    </select>
+
     <select id="selectById" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         select *
@@ -32,6 +45,8 @@
         WHERE id = #{id}
     </select>
 
+
+
     <update id="updateById" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         UPDATE sys_pdf_module
         <set>
@@ -55,8 +70,8 @@
 
     <insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time
-                                     , templateDlUrl, templateType
-                                     , remark1, remark2, remark3)
+                                  , templateDlUrl, templateType
+                                  , remark1, remark2, remark3)
         values (#{name},
                 #{param},
                 #{fieldExplain},
@@ -77,4 +92,4 @@
         from sys_pdf_module
         where id = #{id}
     </delete>
-</mapper>
+</mapper>