20221019合同名称弹窗

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -105,4 +105,11 @@ public class ReimbursementInfoController {
         List<RetureListDto> infos = service.exportList(dto);
         EasyPoiUtil.exportExcel(infos, "报销申请列表信息",  "报销申请列表信息", RetureListDto.class, "", response );
     }
+
+    @ApiOperation(value = "关联报销")
+    @GetMapping(value = "/relationReimbursementList")
+    public ResponseEntity<IPage<RetureListDto>> relationReimbursementList(Page<RetureListDto> page, @RequestParam("id") String id) {
+        IPage<RetureListDto> listDtoIPage = service.relationReimbursementList(page, id);
+        return ResponseEntity.ok(listDtoIPage);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -26,4 +26,6 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
     List<TreeUserDto> findUserList(@Param("name") String name);
 
     List<RetureListDto> findExportList (@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+    IPage<RetureListDto> relationReimbursementList (Page<RetureListDto> page, @Param("id") String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -98,4 +98,33 @@
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
 	</select>
+
+	<select id="relationReimbursementList" resultType="com.jeeplus.test.reimbursement.reimbursementInfo.service.dto.RetureListDto">
+		SELECT
+			a.id,
+			a.`no`,
+			b.type_id,
+			b.type_name,
+			b.project_id,
+			b.project_name,
+			b.report_number,
+			a.user_name,
+			b.user_name AS `name`,
+			b.dept_name,
+			a.reim_date,
+			b.`number`,
+			a.type,
+			a.proc_ins_id,
+			a.process_definition_id,
+			d.ID_ AS task_id
+		FROM
+			reimbursement_info a
+			LEFT JOIN reimbursement_detail_info b ON a.id = b.info_id AND b.del_flag = 0
+			LEFT JOIN sys_user c ON a.create_by =  c.id
+			LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
+		WHERE
+			a.del_flag = 0
+			AND a.project_id IN (SELECT id FROM program_project_list_info WHERE del_flag = 0 AND contract_id = #{id})
+		ORDER BY a.update_date DESC
+	</select>
 </mapper>

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

@@ -377,4 +377,13 @@ public class ReimbursementInfoService {
         }
         return exportList;
     }
+
+    /**
+     * 关联报销
+     */
+    public IPage<RetureListDto> relationReimbursementList(Page<RetureListDto> page, String id) {
+        IPage<RetureListDto> iPage = infoMapper.relationReimbursementList(page, id);
+        return iPage;
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/controller/WorkContractController.java

@@ -9,6 +9,7 @@ import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.TicketQueryUtils;
+import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.test.workClientInfo.domain.dto.WorkClientInfosDto;
 import com.jeeplus.test.workClientInfo.service.WorkClientService;
@@ -83,4 +84,11 @@ public class WorkContractController {
     public void updateStatusById(@RequestBody WorkContractInfoDto workContractInfoDto) {
         workContractService.updateStatusById(workContractInfoDto);
     }
+
+    @ApiOperation(value = "关联项目")
+    @GetMapping(value = "/relationProjectList")
+    public ResponseEntity<IPage<ProgramProjectListInfo>> relationProjectList(@RequestParam String id, Page<ProgramProjectListInfo> page) {
+        IPage<ProgramProjectListInfo> infos = workContractService.relationProjectList(id, page);
+        return ResponseEntity.ok(infos);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/WorkContractInfoMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.test.oss.domain.WorkAttachment;
+import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.workContract.domain.WorkContractInfo;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,6 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
     List<WorkAttachmentDto> findDtos(@Param("id") String id);
 
     void updateStatusById(@Param("id") String id, @Param("status")String status);
+
+    IPage<ProgramProjectListInfo> relationProjectList(@Param("id") String id, Page<ProgramProjectListInfo> page);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -125,4 +125,72 @@
 	<update id="updateStatusById">
 		UPDATE work_contract_info SET `status` = #{status} WHERE del_flag = 0 AND id = #{id}
 	</update>
+
+	<select id="relationProjectList" 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
+        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
+		WHERE
+			a.contract_id = #{id}
+            ORDER BY a.update_date DESC
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jeeplus.sys.utils.TicketQueryUtils;
 import com.jeeplus.test.oss.service.OssService;
+import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.test.workClientInfo.domain.dto.WorkClientInfosDto;
 import com.jeeplus.test.workClientInfo.mapper.WorkClientInfoMapper;
@@ -246,4 +247,14 @@ public class WorkContractService {
             }
         }
     }
+
+    /**
+     * 关联项目
+     * @param id
+     * @return
+     */
+    public IPage<ProgramProjectListInfo> relationProjectList(String id, Page<ProgramProjectListInfo> page) {
+        IPage<ProgramProjectListInfo> infos = workContractInfoMapper.relationProjectList(id, page);
+        return infos;
+    }
 }