diff --git a/pusong-admin/src/main/resources/application-dev.yml b/pusong-admin/src/main/resources/application-dev.yml index a9f4346..e4e6bb2 100644 --- a/pusong-admin/src/main/resources/application-dev.yml +++ b/pusong-admin/src/main/resources/application-dev.yml @@ -42,9 +42,14 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.18.119:3308/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + + url: jdbc:mysql://124.236.46.74:9100/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: Ps123456 + password: rwWhYfCe3Tzhatep + +# url: jdbc:mysql://192.168.18.119:3308/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: Ps123456 # url: jdbc:mysql://47.95.38.123:3306/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: Ps123456@ @@ -94,13 +99,13 @@ spring: spring.data: redis: # 地址 - host: 192.168.18.119 + host: 124.236.46.74 # 端口，默认为6379 - port: 6378 + port: 9101 # 数据库索引 database: 8 # 密码(如没有密码请注释掉) - password: 12345 + password: redis_PhRr2K # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java index 7c929c4..5b46382 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java @@ -50,8 +50,8 @@ public class PsCustomController extends BaseController { */ @SaCheckPermission("business:customInfo:list") @GetMapping("/listByLoginUser") - public TableDataInfo>> listByLoginUser(String customName, String customMobile, String companyName, PageQuery pageQuery) { - return psCustomInfoService.listByLoginUser(customName, customMobile, companyName, pageQuery); + public TableDataInfo>> listByLoginUser(String customName, String customMobile, String companyName, String companyServiceName, PageQuery pageQuery) { + return psCustomInfoService.listByLoginUser(customName, customMobile, companyName, companyServiceName, pageQuery); } /** 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 c7bbc51..ca7a106 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 @@ -11,6 +11,7 @@ import com.pusong.business.domain.vo.TaskPlanVo; import com.pusong.business.service.IPsContractInfoService; import com.pusong.business.service.IPsTaskService; import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.DateUtils; import com.pusong.common.core.validate.QueryGroup; import com.pusong.common.idempotent.annotation.RepeatSubmit; import com.pusong.common.log.annotation.Log; @@ -115,8 +116,9 @@ public class PsTaskController extends BaseController { @Log(title = "主任务完成") @SaCheckPermission("business:task:list") @GetMapping("/mainFinish") - public R mainFinish(@NotNull Long id, Date firstFilingTime) { - contractInfoService.finish(psTaskMainService.finishMain(id, firstFilingTime)); + public R mainFinish(@NotNull Long id, String firstFilingTime) { + Date date = DateUtils.parseDate(firstFilingTime); + contractInfoService.finish(psTaskMainService.finishMain(id, date)); return R.ok(); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java index a00ca95..1b3222b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java @@ -5,6 +5,7 @@ import com.pusong.business.domain.PsCompanyInfo; import com.pusong.common.core.validate.AddGroup; import com.pusong.common.core.validate.EditGroup; import com.pusong.common.core.validate.QueryGroup; +import com.pusong.common.json.utils.JsonUtils; import com.pusong.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -64,6 +65,8 @@ public class PsCompanyQueryBo extends BaseEntity { */ private Integer type; + @JsonFormat(pattern = "yyyy-MM") + private String firstFilingTime; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java index 161eb16..5d8074f 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java @@ -101,7 +101,7 @@ public class PsContractInfoBo { /** * 是否续费 - * o新签 1续费 + * o新签(新客户) 1续费 2新签（老客户） */ private String isDue; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java index e9400bb..208c360 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java @@ -47,7 +47,7 @@ public class PsTaskQueryBo extends BaseEntity { /** * 销售经理姓名 */ - private String customManagerName; + private String customManagerName; /** * 服务项目编码集合 */ @@ -55,30 +55,30 @@ public class PsTaskQueryBo extends BaseEntity { /** * 执行者姓名 */ - private String executor; + private String executor; /** * 所属区域（公司地址） */ - private String companyAdress; + private String companyAdress; /** * 法人手机号 */ - private String mobile; + private String mobile; /** * 法人身份证号 */ - private String idNo; + private String idNo; /** * 法人身份证号 */ - private String name; + private String name; /** * 任务委派类型（1内勤,2外勤,3特勤） 查询子任务列表时使用 */ @NotBlank(message = "任务委派类型不能为空", groups = {QueryGroup.class}) - private String appointType; + private String appointType; /** * 任务类型 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java index 14ded74..4d0f486 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java @@ -281,4 +281,6 @@ public class PsCompanyInfoVo implements Serializable { * 首次申报时间 */ private Date firstFilingTime; + + private String taskRemark; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java index ec98a02..98ec109 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java @@ -32,7 +32,7 @@ public interface IPsCustomInfoService { * 查询登陆人下所有的客户名称和id * @return 客户id和姓名 */ - TableDataInfo listByLoginUser(String customName, String customMobile, String companyName, PageQuery pageQuery); + TableDataInfo listByLoginUser(String customName, String customMobile, String companyName, String companyServiceName, PageQuery pageQuery); /** * 分页查询客户基本信息列表 * diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java index 9c3fe15..c413e2d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java @@ -154,8 +154,11 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { lqw.like(bo.getCompanyName() != null,"com.company_name", bo.getCompanyName()); lqw.eq(bo.getServiceStatus() != null,"com.service_status", bo.getServiceStatus()); - lqw.between(bo.getParams().get("beginTime") != null && bo.getParams().get("endTime") != null, - "com.first_filing_time", bo.getParams().get("beginTime"), bo.getParams().get("endTime")); + if (bo.getFirstFilingTime() != null){ + Date endTimeByMonth = DateUtils.getEndTimeByMonth(DateUtils.parseDate(bo.getFirstFilingTime())); + lqw.between("com.first_filing_time", bo.getFirstFilingTime(), endTimeByMonth); + } + String followUserSql = ""; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index c25ee98..da427ca 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -112,6 +112,13 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { @Override @Transactional//开启事务 public String createContract(PsContractInfoBo bo, Integer type) { + if ("0".equals(bo.getIsDue())){ + bo.setIsOldCus((byte) 0); + }else if ("2".equals(bo.getIsDue())){ + bo.setIsOldCus((byte) 1); + bo.setIsDue("0"); + } + if (bo.getFirstPartyType() == PsContractInfoBo.FIRSTPARTYTYPE.INDIVIDUALS.getType()){ bo.setContactPersonName(bo.getCompanyInfoBo().getLegalPersonName()); bo.setContactPersonPhone(bo.getCompanyInfoBo().getLegalPersonPhone()); @@ -221,6 +228,13 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { * @return 是否新增成功 */ public Long preview(PsContractInfoBo bo){ + if ("0".equals(bo.getIsDue())){ + bo.setIsOldCus((byte) 0); + }else if ("2".equals(bo.getIsDue())){ + bo.setIsOldCus((byte) 1); + bo.setIsDue("0"); + } + //3.如果已存在合同，则进行修改，否则新增 PsContractInfo add = new PsContractInfo(); add.setContractCode(getContractCode());//合同编码 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index b55483d..bb0fa4f 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -72,7 +72,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { * @return 客户id和姓名 */ @Override - public TableDataInfo listByLoginUser(String customName, String customMobile, String companyName, PageQuery pageQuery) { + public TableDataInfo listByLoginUser(String customName, String customMobile, String companyName, String companyServiceName, PageQuery pageQuery) { //查询客户基本信息 Page list = baseMapper.selectPageCustomerList(pageQuery.build() , new QueryWrapper() @@ -82,14 +82,21 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { .isNotNull("info.custom_name") .ne("info.custom_name","") .ne("info.custom_name","无") - .and(StringUtils.isNotBlank(customName) || StringUtils.isNotBlank(customMobile) || StringUtils.isNotBlank(companyName) - , wq -> wq.like(StringUtils.isNotBlank(customName), "info.custom_name", customName) - .or() - .like(StringUtils.isNotBlank(customMobile), "info.custom_mobile", customMobile) - .or() - .exists(StringUtils.isNotBlank(companyName), "select 1 from ps_company_info where ps_company_info.custom_id = ps_custom_info.id and ps_company_info.del_flag = 0 and company_type = 2 and company_name like '%" + companyName + "%'") +// .and(StringUtils.isNotBlank(customName) || StringUtils.isNotBlank(customMobile) || StringUtils.isNotBlank(companyName) +// , wq -> wq.like(StringUtils.isNotBlank(customName), "info.custom_name", customName) +// .or() +// .like(StringUtils.isNotBlank(customMobile), "info.custom_mobile", customMobile) +// .or() +// .exists(StringUtils.isNotBlank(companyName), "select 1 from ps_company_info where ps_company_info.custom_id = info.id and ps_company_info.del_flag = 0 and company_type = 1 and company_name like '%" + companyName + "%'") +// .exists(StringUtils.isNotBlank(companyServiceName), "select 1 from ps_company_info where ps_company_info.custom_id = info.id and ps_company_info.del_flag = 0 and company_type = 2 and company_name like '%" + companyServiceName + "%'") +// +// ) + .like(StringUtils.isNotBlank(customName), "info.custom_name", customName) + .like(StringUtils.isNotBlank(customMobile), "info.custom_mobile", customMobile) + .exists(StringUtils.isNotBlank(companyName), "select 1 from ps_company_info where ps_company_info.custom_id = info.id and ps_company_info.del_flag = 0 and company_type = 1 and company_name like '%" + companyName + "%'") + .exists(StringUtils.isNotBlank(companyServiceName), "select 1 from ps_company_info where ps_company_info.custom_id = info.id and ps_company_info.del_flag = 0 and company_type = 2 and company_name like '%" + companyServiceName + "%'") - )); + ); if (list.getRecords().isEmpty()){ TableDataInfo tableDataInfo = new TableDataInfo(); tableDataInfo.setRows(null); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml index 6f456ef..bdcf350 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml @@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" --pcc.contract_code contract_code, 必须在 com.*, 上边，否则company里的 contract_code值会被com表的字段覆盖 pcc.contract_code, pcc.id pcc_id, + pcc.task_remark, com.*, bus.business_amount bus_business_amount, bus.business_desc bus_business_desc,