1.打印模板添加客户ID字段，关联所属客户

src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java

@@ -32,6 +32,7 @@ import java.io.File;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -205,4 +206,17 @@ public class CompanyController {
         return ResultVOUtils.success();
     }
 
+
+    /**
+     * 查询公司列表信息
+     *
+     * @param filterCompanyRequest
+     * @return
+     */
+    @PostMapping("warehouse/info/getCompanyList")
+    public BaseResponse getCompanyList(@RequestBody FilterCompanyRequest filterCompanyRequest) {
+        List<CompanyEntity> companyEntities = companyService.getCompanyList(filterCompanyRequest);
+        return ResultVOUtils.success(companyEntities);
+    }
+
 }

src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.udi.admin.entity.info;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -81,30 +82,38 @@ public class CompanyEntity {
 
     private String unitIdFk;
 
+    @TableField(exist = false)
+    private String newAuditStatus;
+
+    @TableField(exist = false)
+    private String noPassCause;
+
+    @TableField(exist = false)
+    private String auditor;
+
+    @TableField(exist = false)
     private String filePath;
 
+    @TableField(exist = false)
     private String newFilePath;
 
+    @TableField(exist = false)
     private String filePath2;
 
+    @TableField(exist = false)
     private String newFilePath2;
 
+    @TableField(exist = false)
     private String filePath3;
 
+    @TableField(exist = false)
     private String newFilePath3;
 
+    @TableField(exist = false)
     private String filePath4;
 
+    @TableField(exist = false)
     private String newFilePath4;
 
-    private String updateCause;
-
-    private String newAuditStatus;
-
-    private String noPassCause;
-
-    private String auditor;
-
-    private String auditStatusList;
 
 }

src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.udi.admin.entity.param;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -11,6 +12,7 @@ public class SystemPDFTemplateEntity {
 
     private int id;
 
+    @TableField("`name`")
     private String name;
 
     private int type;
@@ -19,6 +21,7 @@ public class SystemPDFTemplateEntity {
 
     private String param;
 
+    @TableField("`path`")
     private String path;
 
     private int rowCount;
@@ -33,4 +36,9 @@ public class SystemPDFTemplateEntity {
 
     private String jrxmlPath;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateSaveRequest.java

@@ -19,4 +19,9 @@ public class SystemPDFTemplateSaveRequest {
     private Date create_time;
     private Date update_time;
     private String jrxmlPath;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }

src/main/java/com/glxp/udi/admin/res/param/SystemPDFTemplateResponse.java

@@ -21,4 +21,9 @@ public class SystemPDFTemplateResponse {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date update_time;
     private String jrxmlPath;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }

src/main/java/com/glxp/udi/admin/service/info/CompanyService.java

@@ -1,5 +1,7 @@
 package com.glxp.udi.admin.service.info;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.udi.admin.dao.info.CompanyDao;
 import com.glxp.udi.admin.entity.info.CompanyEntity;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -51,4 +54,15 @@ public class CompanyService {
     public String findCompanyName(long customerId) {
         return companyDao.findCompanyName(customerId);
     }
+
+    /**
+     * 查询公司列表信息
+     * @param filterCompanyRequest
+     * @return
+     */
+    public List<CompanyEntity> getCompanyList(FilterCompanyRequest filterCompanyRequest) {
+        QueryWrapper<CompanyEntity> wrapper = new QueryWrapper<>();
+        wrapper.like(StrUtil.isNotBlank(filterCompanyRequest.getCompanyName()),"companyName", filterCompanyRequest.getCompanyName());
+        return companyDao.selectList(wrapper);
+    }
 }

src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java

@@ -26,15 +26,6 @@ public class SystemPDFTemplateService {
         return systemPDFTemplateDao.selectPage(page, buildQueryWrapper(systemPDFTemplateRequest));
     }
 
-    private QueryWrapper<SystemPDFTemplateEntity> buildQueryWrapper(SystemPDFTemplateRequest systemPDFTemplateRequest) {
-        QueryWrapper<SystemPDFTemplateEntity> wrapper = new QueryWrapper<>();
-        wrapper.like(StrUtil.isNotBlank(systemPDFTemplateRequest.getName()), "name", systemPDFTemplateRequest.getName())
-                .eq(null != systemPDFTemplateRequest.getModule(), "module", systemPDFTemplateRequest.getModule())
-                .eq(null != systemPDFTemplateRequest.getId(), "id", systemPDFTemplateRequest.getId())
-                .orderByDesc("update_time");
-        return wrapper;
-    }
-
     public Page<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit) {
         Page<SystemPDFTemplateEntity> pageParam = new Page<>(page, limit);
         if (null == page || null == limit) {
@@ -68,4 +59,14 @@ public class SystemPDFTemplateService {
     public int countByName(String name) {
         return systemPDFTemplateDao.countByName(name);
     }
+
+    private QueryWrapper<SystemPDFTemplateEntity> buildQueryWrapper(SystemPDFTemplateRequest systemPDFTemplateRequest) {
+        QueryWrapper<SystemPDFTemplateEntity> wrapper = new QueryWrapper<>();
+        wrapper.like(StrUtil.isNotBlank(systemPDFTemplateRequest.getName()), "name", systemPDFTemplateRequest.getName())
+                .eq(null != systemPDFTemplateRequest.getModule(), "module", systemPDFTemplateRequest.getModule())
+                .eq(null != systemPDFTemplateRequest.getId(), "id", systemPDFTemplateRequest.getId())
+                .orderByDesc("update_time");
+        return wrapper;
+    }
+
 }

src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml

@@ -46,24 +46,29 @@
             <if test="jrxmlPath != null">
                 jrxmlPath=#{jrxmlPath},
             </if>
+            <if test="customerId != null and customerId != ''">
+                customerId = #{customerId}
+            </if>
         </set>
         WHERE id=#{id}
     </update>
 
     <insert id="insertData" parameterType="com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity">
         insert INTO system_pdf_template(name,
-        type, module, param, path, rowCount, qrcodeCount, remark, create_time,
-        update_time, jrxmlPath)
+                                        type, module, param, path, rowCount, qrcodeCount, remark, create_time,
+                                        update_time, jrxmlPath, customerId)
         values (#{name},
-        #{type},
-        #{module},
-        #{param},
-        #{path},
-        #{rowCount},
-        #{qrcodeCount},
-        #{remark},
-        #{create_time},
-        #{update_time}, #{jrxmlPath})
+                #{type},
+                #{module},
+                #{param},
+                #{path},
+                #{rowCount},
+                #{qrcodeCount},
+                #{remark},
+                #{create_time},
+                #{update_time},
+                #{jrxmlPath},
+                #{customerId})
     </insert>
 
     <select id="listPDFTemplates" parameterType="java.lang.Integer"
@@ -72,7 +77,9 @@
         FROM system_pdf_template
     </select>
     <select id="countByName" resultType="java.lang.Integer">
-        select count(*) from system_pdf_template where name = #{name}
+        select count(*)
+        from system_pdf_template
+        where name = #{name}
     </select>
 
     <delete id="deleteById" parameterType="java.lang.Integer">