Quellcode durchsuchen

Merge remote-tracking branch 'origin/master'

lizhenhao vor 2 Jahren
Ursprung
Commit
5f1a3fcaf7

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

@@ -200,8 +200,8 @@ public class ProjectListController {
      */
     @GetMapping("/exportFile")
     @ApiOperation(value = "导出")
-    public void exportFileUploadList(HttpServletResponse response) {
-        List<ExportFileDto> infos = projectListService.exportList();
+    public void exportFileUploadList(ProgramProjectListInfo info, HttpServletResponse response) throws Exception{
+        List<ExportFileDto> infos = projectListService.exportList(info);
         EasyPoiUtil.exportExcel(infos, "项目登记列表信息",  "项目登记列表信息", ExportFileDto.class, "", response );
     }
 

+ 2 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -21,8 +21,9 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
 
     IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
+    List<ProgramProjectListInfo> findInfoList(@Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
-    List<ExportFileDto> findList();
+    List<ExportFileDto> findList(@Param("infoList")List<ProgramProjectListInfo> infoList);
 
     IPage<ProgramProjectListInfo> findPage(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 

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

@@ -146,6 +146,95 @@
             ORDER BY a.update_date DESC
     </select>
 
+    <select id="findInfoList" resultType="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo">
+        SELECT
+           a.id,
+           b.name AS create_by,
+           a.create_date,
+           a.update_by,
+           a.update_date,
+           a.del_flag,
+           a.contract_id,
+           a.contract_name,
+           a.client,
+           a.client_name,
+           a.amount,
+           a.contract_type,
+           a.name,
+           a.no,
+           a.project_type,
+           a.approval_no,
+           a.company,
+           a.project_mould,
+           a.property_holder,
+           a.property_holder_name,
+           a.location,
+           a.is_first,
+           a.year_num,
+           a.check_year,
+           a.project_manager,
+           c.name AS project_manager_name,
+           a.report_type,
+           a.industry,
+           a.enterprise_type,
+           a.risk_level,
+           a.project_source,
+           a.estimate,
+           a.plan_end_time,
+           a.use_num,
+           a.appointment,
+           a.work_hours,
+           a.remarks,
+           a.assessment_enterprise,
+           a.assessment_enterprise_name,
+           a.link_num,
+           a.relationship,
+           a.assessment_way,
+           a.assessment_objective,
+           a.assessment_date,
+           a.num,
+           a.project_development,
+           a.delegate_project_type,
+           a.assessment_object,
+           a.work_begin_date,
+           a.work_end_date,
+           a.reporting_date,
+           a.is_have,
+           a.is_influence,
+           a.mode,
+           a.status,
+           a.proc_ins_id,
+           a.process_definition_id,
+           prn.report_no,
+           pa1.status as status1,
+           pa1.id as auditId1,
+           pa1.proc_ins_id as procInsId1,
+           pa2.status as status2,
+           pa2.id as auditId2,
+           pa2.proc_ins_id as procInsId2,
+           pa3.status as status3,
+           pa3.id as auditId3,
+           pa3.proc_ins_id as procInsId3,
+           pa.status as archive_status,
+           pa.id as archive_id,
+           pa.proc_ins_id as procInsIdArchive,
+           d.id AS issued_id,
+           d.proc_ins_id AS procInsId4,
+           d.status AS issued_status
+        FROM
+            program_project_list_info a
+            LEFT JOIN sys_user b ON a.create_by = b.id
+            LEFT JOIN sys_user c ON a.project_manager = c.id
+            LEFT JOIN program_report_no prn ON prn.program_id = a.id
+            LEFT JOIN program_audit pa1 ON pa1.program_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
+            LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
+            LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
+            LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
+            LEFT JOIN proofread_issued d ON a.id = d.project_id
+            ${ew.customSqlSegment}
+            ORDER BY a.update_date DESC
+    </select>
+
     <select id="getById" resultType="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo">
         SELECT
            a.id,
@@ -274,6 +363,12 @@
                 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
+            <if test="infoList != null">
+                AND a.id IN
+                <foreach collection="infoList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
             ORDER BY a.update_date DESC) AS tab
             ,(SELECT @i:=0) AS itable
     </select>

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

@@ -394,8 +394,14 @@ public class ProjectListService {
         return pageList;
     }
 
-    public List<ExportFileDto> exportList(){
-        List<ExportFileDto> list = projectListMapper.findList();
+    public List<ExportFileDto> exportList(ProgramProjectListInfo info) throws Exception{
+        QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
+        wrapper.eq("a.del_flag", "0");
+        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);
         return list;
     }
 
@@ -1038,7 +1044,11 @@ public class ProjectListService {
         //签发人
         if(null != issuedById){
             //校对负责人
-            data.put("signer","");
+            if(StringUtils.isNotBlank(issuedById.getAgreeUserId())){
+                data.put("signer",UserUtils.get(issuedById.getAgreeUserId()).getName());
+            }else{
+                data.put("signer","");
+            }
             //校对时间
             Date issuedAgreeTime=issuedById.getAgreeTime();
             if(null == issuedAgreeTime){
@@ -1058,6 +1068,11 @@ public class ProjectListService {
         if(null != programArchiveDto){
             //校对负责人
             data.put("archiveMaster","");
+            if(StringUtils.isNotBlank(programArchiveDto.getAuditUserId())){
+                data.put("archiveMaster",UserUtils.get(programArchiveDto.getAuditUserId()).getName());
+            }else{
+                data.put("archiveMaster","");
+            }
             //校对时间
             Date auditDate=programArchiveDto.getAuditDateDate();
             if(null == auditDate){

+ 4 - 4
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/service/dto/ProjectDTO.java

@@ -53,7 +53,7 @@ public class ProjectDTO extends BaseDTO {
     /**
      * 评估基准日ui
      */
-    @Excel(name = "评估基准日",format = "yyyy/MM/dd")
+    @Excel(name = "评估基准日",importFormat = "yyyy/MM/dd")
     private String evaluationBaseDateUi;
 
     /**
@@ -65,7 +65,7 @@ public class ProjectDTO extends BaseDTO {
     /**
      * 评估报告日ui
      */
-    @Excel(name = "评估报告日",format = "yyyy/MM/dd")
+    @Excel(name = "评估报告日",importFormat = "yyyy/MM/dd")
     private String evaluationReportDateUi;
 
     /**
@@ -143,7 +143,7 @@ public class ProjectDTO extends BaseDTO {
     /**
      * 开票日期ui
      */
-    @Excel(name = "开票日期",format = "yyyy/MM/dd")
+    @Excel(name = "开票日期",importFormat = "yyyy/MM/dd")
     private String invoiceDateUi;
 
     /**
@@ -209,7 +209,7 @@ public class ProjectDTO extends BaseDTO {
     /**
      * 报销日期ui
      */
-    @Excel(name = "报销日期",format = "yyyy/MM/dd")
+    @Excel(name = "报销日期",importFormat = "yyyy/MM/dd")
     private String reimbursementDateUi;
 
     /**

+ 2 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -97,10 +97,10 @@ public class ReimbursementInfoService {
         // 报销金额
         if (dto.getAmounts() != null) {
             if (StringUtils.isNotEmpty(dto.getAmounts()[0])) {
-                queryWrapper.ge("b.number", dto.getAmounts()[0]);
+                queryWrapper.ge("b.number", Double.parseDouble(dto.getAmounts()[0]));
             }
             if (StringUtils.isNotEmpty(dto.getAmounts()[1])) {
-                queryWrapper.le("b.number", dto.getAmounts()[1]);
+                queryWrapper.le("b.number", Double.parseDouble(dto.getAmounts()[1]));
             }
         }
         // 报告号