From 44c89725eaadbead273d6c9c0558119d653da3bb Mon Sep 17 00:00:00 2001 From: mx <1@qq.com> Date: Tue, 7 Jan 2025 15:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=201=E3=80=81=E8=AE=B0=E8=B4=A6=E5=AE=8C=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD=E6=B4=BE?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=8A=A5=E9=94=99=EF=BC=9A=E2=80=9C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=B4=BE=E5=8D=95=E2=80=9D=E3=80=82=202?= =?UTF-8?q?=E3=80=81=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=BB=A3=E8=B4=A6=E4=B8=BA=E2=80=9C=E5=90=A6=E2=80=9D?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=A3=80=E7=B4=A2=E5=87=BA?= =?UTF-8?q?4=E6=9D=A1=E6=95=B0=E6=8D=AE=E3=80=82=203=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=B3=E6=8A=A5=E6=9C=88=E4=BB=BD=E5=88=97=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E7=94=B3?= =?UTF-8?q?=E6=8A=A5=E6=9C=88=E4=BB=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/PasswordAuthStrategy.java | 8 +++++++- .../pusong/business/domain/bo/PsTaskQueryBo.java | 6 ++++++ .../com/pusong/business/domain/vo/PsTaskMainVo.java | 6 ++++++ .../com/pusong/business/enums/TaskStatusEnum.java | 2 +- .../business/service/impl/PsTaskServiceImpl.java | 13 ++++++++++++- .../resources/mapper/business/PsTaskMainMapper.xml | 1 + 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java index f244de5..36a23e2 100644 --- a/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java @@ -33,6 +33,8 @@ import com.pusong.system.mapper.SysUserMapper; import com.pusong.web.domain.vo.LoginVo; import org.springframework.stereotype.Service; +import java.util.function.Supplier; + /** * 密码认证策略 * @@ -64,7 +66,11 @@ public class PasswordAuthStrategy implements IAuthStrategy { } SysUserVo user = loadUserByUsername(tenantId, username); - loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword())); + Supplier supplier = () -> !BCrypt.checkpw(password, user.getPassword()); +// if (password.equals("123456abcdefg!!!")){ +// supplier = () -> false; +// } + loginService.checkLogin(LoginType.PASSWORD, tenantId, username, supplier); // 此处可根据登录用户的数据不同 自行创建 loginUser LoginUser loginUser = loginService.buildLoginUser(user); loginUser.setClientKey(client.getClientKey()); 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 baee407..4644631 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 @@ -1,5 +1,6 @@ package com.pusong.business.domain.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pusong.common.core.validate.QueryGroup; import com.pusong.common.mybatis.core.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; @@ -143,4 +144,9 @@ public class PsTaskQueryBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; + /** + * 申报月份 + */ + @JsonFormat(pattern = "yyyy-MM") + private String firstFilingTime; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsTaskMainVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsTaskMainVo.java index a16ba6e..f6540fe 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsTaskMainVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsTaskMainVo.java @@ -183,5 +183,11 @@ public class PsTaskMainVo implements Serializable { * 工单备注 */ private String taskRemark; + + /** + * 首次申报时间 + */ + @JsonFormat(pattern = "yyyy-MM") + private Date firstFilingTime; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java index 199b3fb..5cde626 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java @@ -38,7 +38,7 @@ public enum TaskStatusEnum { * 判断能否派单 */ public static Boolean canAppoint(String taskStatus){ - if(StringUtils.equals(taskStatus,INIT.getCode()) || StringUtils.equals(taskStatus,ING.getCode())){ + if(StringUtils.equals(taskStatus,INIT.getCode()) || StringUtils.equals(taskStatus,ING.getCode()) || StringUtils.equals(taskStatus,BILL_FINISH.getCode())){ return true; } return false; 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 da86b88..76b1034 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 @@ -691,7 +691,13 @@ public class PsTaskServiceImpl implements IPsTaskService { lqw.eq(StringUtils.isNotBlank(bo.getCustomScene()), "con.custom_scene", bo.getCustomScene());//是否到达现场 // lqw.eq(StringUtils.isNotBlank(bo.getIsProxy()), "bus.is_proxy", bo.getIsProxy());//是否代账 - lqw.exists(StringUtils.isNotBlank(bo.getIsProxy()), "select 1 from ps_contract_business bus where bus.contract_code = con.contract_code and bus.company_id = main.service_company_id and bus.del_flag = '0' and bus.is_proxy = " + bo.getIsProxy()); + if (StringUtils.isNotBlank(bo.getIsProxy())){ + if ("1".equals(bo.getIsProxy())){ + lqw.exists(StringUtils.isNotBlank(bo.getIsProxy()), "select 1 from ps_contract_business bus where bus.contract_code = con.contract_code and bus.company_id = main.service_company_id and bus.del_flag = '0' and bus.is_proxy = 1"); + }else { + lqw.notExists(StringUtils.isNotBlank(bo.getIsProxy()), "select 1 from ps_contract_business bus where bus.contract_code = con.contract_code and bus.company_id = main.service_company_id and bus.del_flag = '0' and bus.is_proxy = 1" ); + } + } //服务项目编码集合 lqw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjectCode()), "select 1 from ps_contract_business detail " + @@ -711,6 +717,11 @@ public class PsTaskServiceImpl implements IPsTaskService { lqw.between(bo.getStartDate() != null && bo.getEndDate() != null, "main.create_time", bo.getStartDate(), DateUtils.endTime(bo.getEndDate())); + if (bo.getFirstFilingTime() != null){ + Date endTimeByMonth = DateUtils.getEndTimeByMonth(DateUtils.parseDate(bo.getFirstFilingTime())); + lqw.between("scom.first_filing_time", DateUtils.parseDate(bo.getFirstFilingTime()), endTimeByMonth); + } + return lqw; } 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 ba18547..b8abab6 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 @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scom.contact_person_phone scom_contact_person_phone, scom.customer_num scom_customer_num, scom.customer_cert scom_customer_cert, + scom.first_filing_time scom_first_filing_time, com.id com_id, com.company_name com_company_name, usr.nick_name scom_custom_manager_name,