Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/controller/ProjectListController.java

@@ -3,6 +3,8 @@ package com.jeeplus.test.program.configuration.projectList.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.demo.annotation.DemoMode;
+import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.test.utils.FreemarkerUtil;
 import freemarker.template.Configuration;
@@ -23,6 +25,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -139,6 +142,22 @@ public class ProjectListController {
         return ResponseEntity.ok(s);
     }
 
+
+    /**
+     * 批量删除字典
+     */
+    @DemoMode
+    @ApiLog("批量删除项目信息")
+    @PreAuthorize("hasAuthority('program:registered:del')")
+    @DeleteMapping("delete")
+    public ResponseEntity delete(String ids) {
+        String idArray[] = ids.split ( "," );
+        for(String id: idArray){
+            projectListService.deleteById ( id );
+        }
+        return ResponseEntity.ok ( "删除信息成功！" );
+    }
+
     /**
      * 合同信息列表查询
      * @param dto
@@ -224,12 +243,19 @@ public class ProjectListController {
      */
     @GetMapping("/exportFile")
     @ApiOperation(value = "导出")
-    public void exportFileUploadList(ProgramProjectListInfo info, HttpServletResponse response) throws Exception{
-        List<ExportFileDto> infos = projectListService.exportList(info);
-        EasyPoiUtil.exportExcel(infos, "项目登记列表信息",  "项目登记列表信息", ExportFileDto.class, "", response );
+    public void exportFileUploadList(ProgramProjectListInfo info,String tabType, HttpServletResponse response) throws Exception{
+        List<ExportFileDto> infos = projectListService.exportList(info,tabType);
+        String title = "项目登记列表信息";
+        String sheetName = "项目登记列表信息";
+        if("2022".equals(tabType)){
+            title = "2022年" + title;
+            sheetName = "2022年" + sheetName;
+        }
+        EasyPoiUtil.exportExcel(infos, title,  sheetName, ExportFileDto.class, "", response );
     }
 
 
+
     /**
      * 根据项目id生成报告号
      * @param id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -336,10 +336,11 @@
                 d.`name` AS client_name,
                 a.`name`,
                 a.assessment_objective,
-                b.program_type,
-                DATE_FORMAT(a.assessment_date,"%y-%m-%d") AS assessment_date,
-                DATE_FORMAT(b.evaluation_report_date,"%y-%m-%d") AS evaluation_report_date,
+                a.project_mould as program_type,
+                DATE_FORMAT(a.assessment_date,'%Y-%m-%d') AS assessment_date,
+                DATE_FORMAT(b.evaluation_report_date, '%Y-%m-%d') as "evaluation_report_date",
                 b.protocol_num,
+                c.no as contract_num,
                 e.report_no,
                 f.`name` AS project_manager_name,
                 g.`name` AS signature_evaluator_first,
@@ -350,9 +351,9 @@
                 b.rent_evaluation,
                 b.forensics,
                 b.report_charges,
-                b.current_dispose_person,
+                i.name as current_dispose_person,
                 (CASE b.is_invoice WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_invoice,
-                DATE_FORMAT(b.invoice_date,"%y-%m-%d") AS invoice_date,
+                DATE_FORMAT(b.invoice_date,'%Y-%m-%d') AS invoice_date,
                 (CASE b.is_contract_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_contract_archive,
                 (CASE b.is_papers_intact WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_intact,
                 (CASE b.is_papers_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_archive
@@ -363,6 +364,7 @@
                 LEFT JOIN work_client_info d ON c.client_id = d.id
                 LEFT JOIN program_report_no e ON a.id = e.program_id
                 LEFT JOIN sys_user f ON a.project_manager = f.id
+                LEFT JOIN sys_user i ON b.current_dispose_person = i.id
                 LEFT JOIN sys_user g ON b.signature_evaluator_first = g.id
                 LEFT JOIN sys_user h ON b.signature_evaluator_second = h.id
             WHERE a.del_flag = 0

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -2,12 +2,14 @@ package com.jeeplus.test.program.configuration.projectList.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
@@ -413,7 +415,7 @@ public class ProjectListService {
         LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(WorkAttachment::getAttachmentId, id);
         ossServiceMapper.delete(wrapper);
-        return "操作成功";
+        return "删除项目成功";
     }
 
     public IPage<WorkContractInfo> findContractPageList(ContractDto dto, Page<WorkContractInfo> page) {
@@ -456,14 +458,25 @@ public class ProjectListService {
         return pageList;
     }
 
-    public List<ExportFileDto> exportList(ProgramProjectListInfo info) throws Exception{
+    public List<ExportFileDto> exportList(ProgramProjectListInfo info, String tabType) throws Exception{
         QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
         wrapper.eq("a.del_flag", "0");
+        wrapper.eq("a.tab_type", tabType);
         if (info.getCreateDates() != null) {
             wrapper.between("a.create_date", info.getCreateDates()[0], info.getCreateDates()[1]);
         }
         List<ProgramProjectListInfo> infoList = projectListMapper.findInfoList(wrapper);
         List<ExportFileDto> list = projectListMapper.findList(infoList);
+        List<DictValueDTO> dictDTOList = DictUtils.getDictDTOList("program_registered_type");
+        for (ExportFileDto projectInfo: list) {
+            for (DictValueDTO dictInfo: dictDTOList) {
+                if (StrUtil.isNotBlank(projectInfo.getProgramType())){
+                    if (projectInfo.getProgramType().equals(dictInfo.getValue())){
+                        projectInfo.setProgramType(dictInfo.getLabel());
+                    }
+                }
+            }
+        }
         return list;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/dto/ExportFileDto.java

@@ -57,10 +57,16 @@ public class ExportFileDto {
     /**
      * 协议号(归档表)
      */
-    @Excel(name = "协议号", width = 20, orderNum = "9")
+    //@Excel(name = "协议号", width = 20, orderNum = "9")
     private String protocolNum;
 
     /**
+     * 合同编号(合同表)
+     */
+    @Excel(name = "合同编号", width = 20, orderNum = "9")
+    private String contractNum;
+
+    /**
      * 文号(报告号表)
      */
     @Excel(name = "文号", width = 20, orderNum = "10")
@@ -109,9 +115,9 @@ public class ExportFileDto {
     private String rentEvaluation;
 
     /**
-     * 司法鉴定(归档表)
+     * 其他(归档表)
      */
-    @Excel(name = "司法鉴定", width = 20, orderNum = "18")
+    @Excel(name = "其他", width = 20, orderNum = "18")
     private String forensics;
 
     /**