From 6849120f55b319c3e94c3369752a39f0b69cb752 Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Fri, 11 Oct 2024 14:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=94=80=E5=94=AE=E6=9C=AC?= =?UTF-8?q?=E4=BA=BA=E7=9A=84=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pusong/business/controller/PsTaskController.java | 2 +- .../com/pusong/business/domain/vo/PsContractBusinessVo.java | 6 ++++++ .../com/pusong/business/mapper/PsContractInfoMapper.java | 6 +++--- .../com/pusong/business/service/impl/PsTaskServiceImpl.java | 2 +- .../resources/mapper/business/PsContractBusinessMapper.xml | 6 ++++-- .../src/main/resources/mapper/business/PsTaskMainMapper.xml | 5 +++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java index 97fa2d9..b5e81f2 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java @@ -133,7 +133,7 @@ public class PsTaskController extends BaseController { @GetMapping("/childFinish") @RepeatSubmit() public R childFinish(@NotNull Long id,String desc) { - psTaskMainService.finishChild(id,desc); + psTaskMainService.finishChild(id, desc); return R.ok(); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java index d8697e5..4ead352 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java @@ -84,4 +84,10 @@ public class PsContractBusinessVo implements Serializable { */ private String isOld; + /** + * 签约日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date applyDate; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java index 5d9c905..8898a9a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java @@ -31,19 +31,19 @@ public interface PsContractInfoMapper extends BaseMapperPlus selectPageContractList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "info.create_dept"), - @DataColumn(key = "userName", value = "info.create_by") + @DataColumn(key = "userName", value = "info.custom_manager") }) Page selectPageContractListByCustomId(@Param("page") Page page, @Param("customId") Long customId); @DataPermission({ @DataColumn(key = "deptName", value = "info.create_dept"), - @DataColumn(key = "userName", value = "info.create_by") + @DataColumn(key = "userName", value = "info.custom_manager") }) List selectContractList(@Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index 72e4f86..cd3d393 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -387,7 +387,7 @@ public class PsTaskServiceImpl implements IPsTaskService { * @param id 任务主键id * @return */ - public void finishChild(Long id,String desc){ + public void finishChild(Long id, String desc){ PsTaskAppoint appoint = appointMapper.selectById(id); if(StringUtils.equals("3",appoint.getAppointType()) && StringUtils.isBlank(desc)){ throw new ServiceException("请填写特勤备注"); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml index 1138871..4af476d 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml @@ -20,9 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" detail.business_project_label detail_business_project_label, detail.amount detail_amount, detail.amount_desc detail_amount_desc, - detail.extent_info detail_extent_info + detail.extent_info detail_extent_info, + con.apply_date from ps_contract_business bus left join ps_contract_business_detail detail on bus.id = detail.business_id + left join ps_contract_info con on con.contract_code = bus.contract_code where bus.del_flag = 0 and (detail.del_flag = 0 or detail.del_flag is null) and bus.contract_code in @@ -30,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{code} - and company_id = ${serviceCompanyId} + and bus.company_id = ${serviceCompanyId} diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml index 159589d..da9b7b9 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -84,8 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select appo.executor as executors, appo.*, - main.*, main.id main_id, + main.id mainid, + main.*, con.is_proxy con_is_proxy, con.custom_scene con_custom_scene, con.custom_manager con_custom_manager,