Merge branch 'develop' into feature-licancan

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -717,6 +717,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						errorInfo.append(EmployeeConstants.CONTRACT_NO_IN_USE);
 					} else {
 						insert.setContractName(contractInfo.getContractName());
+						insert.setContractSubName(contractInfo.getContractSubName());
+						insert.setReason(contractInfo.getReason());
 						insert.setSubjectUnit(contractInfo.getSubjectUnit());
 						insert.setContractParty(contractInfo.getContractParty());
 						insert.setContractType(contractInfo.getContractType());

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class UpmsDaprUtils {
 
 	@Autowired
-	private DaprUpmsProperties daprUpmsProperties;
+	private static DaprUpmsProperties daprUpmsProperties;
 
 	/**
 	 * 获取所有区域数据
@@ -31,7 +31,7 @@ public class UpmsDaprUtils {
 	 * @Date 2022-07-18
 	 * @return
 	 **/
-	public R<List<SysArea>> getAreaListR() {
+	public static R<List<SysArea>> getAreaListR() {
 		R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(areaListR)){
 			return R.failed("获取所有区域数据失败！");

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 保险公司表
+ *
+ * @author zhaji
+ * @return {@link null}
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_company")
+@Tag(name = "保险公司表")
+public class TInsuranceCompany extends BaseEntity {
+    /**
+     * 保险公司id
+     */
+    private Long id;
+
+    /**
+     * 保险公司名称
+     */
+    private String companyName;
+
+    /**
+     * 保险公司地址
+     */
+    private String companyAddress;
+
+    /**
+     * 对接人
+     */
+    private String companyDocking;
+
+    /**
+     * 删除标志(0：未删除，1：删除)
+     */
+    private Integer deleteFlag;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompanyInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 保险公司实体
- * @date 2022-07-18 14:12:35
- */
-@Data
-@TableName("t_insurance_company")
-@EqualsAndHashCode()
-@Schema(description = "保险公司实体类")
-public class TInsuranceCompanyInfo  implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 保险公司id
-	 */
-	private String id;
-
-	/**
-	 * 保险公司名称
-	 */
-	private String companyName;
-
-	/**
-	 * 保险公司地址
-	 */
-	private String companyAddress;
-
-	/**
-	 * 对接人
-	 */
-	private String companyDocking;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 创建人姓名
-	 */
-	private String createName;
-
-	/**
-	 * 创建时间
-	 */
-	private String createTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-
-	/**
-	 * 删除标志
-	 */
-	private String deleteFlag;
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 险种表
+ * @TableName t_insurance_type
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_type")
+@Tag(name = "险种表")
+public class TInsuranceType extends BaseEntity {
+    /**
+     * 险种id
+     */
+    private Long id;
+
+    /**
+     * 保险名称
+     */
+    private String name;
+
+    /**
+     * 保险公司主键ID
+     */
+    private Long insuranceCompanyId;
+
+    /**
+     * 收款单位名称
+     */
+    private String receiptUnitName;
+
+    /**
+     * 收款银行名称
+     */
+    private String bankName;
+
+    /**
+     * 收款银行账号
+     */
+    private String bankNo;
+
+    /**
+     * 删除标志(0：未删除，1：删除)
+     */
+    private Integer deleteFlag;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 险种实体类
- * @date 2022-07-18 14:00:42
- */
-@Data
-@TableName("t_insurance_type")
-@EqualsAndHashCode()
-@Schema(description = "险种实体类")
-public class TInsuranceTypeInfo  implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 险种id
-	 */
-	private String	id;
-
-	/**
-	 * 险种名称
-	 */
-	private String	name;
-
-	/**
-	 * 保险公司主键ID
-	 */
-	private String	insuranceCompanyId;
-
-	/**
-	 * 收款单位名称
-	 */
-	private String	receiptUnitName;
-
-	/**
-	 * 收款银行名称
-	 */
-	private String	bankName;
-
-	/**
-	 * 收款银行账号
-	 */
-	private String	bankNo;
-
-	/**
-	 * 创建时间
-	 */
-	private String createTime;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 删除标志
-	 */
-	private String deleteFlag;
-}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeRate.java

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
- * @author zhaji
- * @description 费率实体类
- * @date 2022-07-18 15:48:24
+ * 费率表
+ * @TableName t_insurance_type_rate
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("t_insurance_type_rate")
-@EqualsAndHashCode()
-@Schema(description = "费率实体类")
-public class TInsuranceTypeRate implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 费率id
-	 */
-	private String id ;
-
-	/**
-	 * 险种id
-	 */
-	private String insuranceTypeId ;
-
-	/**
-	 * 月数
-	 */
-	private String month ;
-
-	/**
-	 * 费率
-	 */
-	private String rate ;
-
-}
+@Tag(name = "费率表")
+public class TInsuranceTypeRate extends BaseEntity {
+    /**
+     * 费率id
+     */
+    private String id;
+
+    /**
+     * 险种ID
+     */
+    private String insuranceTypeId;
+
+    /**
+     * 月数
+     */
+    private Integer month;
+
+    /**
+     * 费率
+     */
+    private BigDecimal rate;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandard.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 购买标准表
+ * @TableName t_insurance_type_standard
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_type_standard")
+@Tag(name = "保险公司表")
+public class TInsuranceTypeStandard extends BaseEntity {
+    /**
+     * 
+     */
+    private String id;
+
+    /**
+     * 险种主键ID
+     */
+    private String insuranceTypeId;
+
+    /**
+     * 购买标准
+     */
+    private String buyStandard;
+
+    /**
+     * 
+     */
+    private Integer type;
+
+    /**
+     * 医疗额度
+     */
+    private String medicalQuota;
+
+    /**
+     * 身故或残疾额度
+     */
+    private String dieDisableQuota;
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandardInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 购买标准表
- * @date 2022-07-18 14:52:03
- */
-@Data
-@TableName("t_insurance_type_standard")
-@EqualsAndHashCode()
-@Schema(description = "购买标准实体类")
-public class TInsuranceTypeStandardInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 购买标准id
-	 */
-	private String id ;
-
-	/**
-	 * 险种ID
-	 */
-	private String insuranceTypeId ;
-
-	/**
-	 * 购买标准
-	 */
-	private String buyStandard ;
-
-	/**
-	 * 类型
-	 */
-	private String type ;
-
-	/**
-	 * 医疗额度
-	 */
-	private String medicalQuota ;
-
-	/**
-	 * 身故或残疾额度
-	 */
-	private String dieDisableQuota ;
-
-
-}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceCompanyController.java

+package com.yifu.cloud.plus.v1.yifu.insurances.controller;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaji
+ * @description 保险公司相关
+ * @date 2022-07-18 17:40:50
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceCompany")
+@Tag(name = "保险公司相关")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TInsuranceCompanyController {
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeController.java

+package com.yifu.cloud.plus.v1.yifu.insurances.controller;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaji
+ * @description 险种相关
+ * @date 2022-07-18 17:41:08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceType")
+@Tag(name = "险种相关")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TInsuranceTypeController {
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeRateController.java

+package com.yifu.cloud.plus.v1.yifu.insurances.controller;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaji
+ * @description 费率相关
+ * @date 2022-07-18 17:41:20
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceTypeRate")
+@Tag(name = "费率相关")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TInsuranceTypeRateController {
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeStandardController.java

+package com.yifu.cloud.plus.v1.yifu.insurances.controller;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaji
+ * @description 购买标准相关
+ * @date 2022-07-18 17:41:36
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceTypeStandard")
+@Tag(name = "购买标准相关")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TInsuranceTypeStandardController {
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceCompanyMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:09
+* @Entity generator.domain.TInsuranceCompany
+*/
+@Mapper
+public interface TInsuranceCompanyMapper extends BaseMapper<TInsuranceCompany> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:23
+* @Entity generator.domain.TInsuranceType
+*/
+@Mapper
+public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeRateMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:33
+* @Entity generator.domain.TInsuranceTypeRate
+*/
+@Mapper
+public interface TInsuranceTypeRateMapper extends BaseMapper<TInsuranceTypeRate> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeStandardMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:41
+* @Entity generator.domain.TInsuranceTypeStandard
+*/
+@Mapper
+public interface TInsuranceTypeStandardMapper extends BaseMapper<TInsuranceTypeStandard> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceCompanyService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:09
+*/
+public interface TInsuranceCompanyService extends IService<TInsuranceCompany> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeRateService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:33
+*/
+public interface TInsuranceTypeRateService extends IService<TInsuranceTypeRate> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:23
+*/
+public interface TInsuranceTypeService extends IService<TInsuranceType> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeStandardService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:41
+*/
+public interface TInsuranceTypeStandardService extends IService<TInsuranceTypeStandard> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceCompanyServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:09
+*/
+@Service
+public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyMapper, TInsuranceCompany> implements TInsuranceCompanyService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeRateServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:33
+*/
+@Service
+public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRateMapper, TInsuranceTypeRate> implements TInsuranceTypeRateService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:23
+*/
+@Service
+public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper, TInsuranceType> implements TInsuranceTypeService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeStandardServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:41
+*/
+@Service
+public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTypeStandardMapper, TInsuranceTypeStandard> implements TInsuranceTypeStandardService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceCompanyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany">
+            <id property="id" column="ID" jdbcType="BIGINT"/>
+            <result property="companyName" column="COMPANY_NAME" jdbcType="VARCHAR"/>
+            <result property="companyAddress" column="COMPANY_ADDRESS" jdbcType="VARCHAR"/>
+            <result property="companyDocking" column="COMPANY_DOCKING" jdbcType="VARCHAR"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,COMPANY_NAME,COMPANY_ADDRESS,
+        COMPANY_DOCKING,CREATE_BY,CREATE_NAME,
+        CREATE_TIME,UPDATE_BY,UPDATE_TIME,
+        DELETE_FLAG
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType">
+            <id property="id" column="ID" jdbcType="BIGINT"/>
+            <result property="name" column="NAME" jdbcType="VARCHAR"/>
+            <result property="insuranceCompanyId" column="INSURANCE_COMPANY_ID" jdbcType="BIGINT"/>
+            <result property="receiptUnitName" column="RECEIPT_UNIT_NAME" jdbcType="VARCHAR"/>
+            <result property="bankName" column="BANK_NAME" jdbcType="VARCHAR"/>
+            <result property="bankNo" column="BANK_NO" jdbcType="VARCHAR"/>
+            <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,NAME,INSURANCE_COMPANY_ID,
+        RECEIPT_UNIT_NAME,BANK_NAME,BANK_NO,
+        DELETE_FLAG,CREATE_BY,CREATE_NAME,
+        CREATE_TIME,UPDATE_BY,UPDATE_TIME
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeRateMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
+            <result property="month" column="MONTH" jdbcType="INTEGER"/>
+            <result property="rate" column="RATE" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INSURANCE_TYPE_ID,MONTH,
+        RATE
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
+            <result property="buyStandard" column="BUY_STANDARD" jdbcType="VARCHAR"/>
+            <result property="type" column="TYPE" jdbcType="TINYINT"/>
+            <result property="medicalQuota" column="MEDICAL_QUOTA" jdbcType="VARCHAR"/>
+            <result property="dieDisableQuota" column="DIE_DISABLE_QUOTA" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INSURANCE_TYPE_ID,BUY_STANDARD,
+        TYPE,MEDICAL_QUOTA,DIE_DISABLE_QUOTA
+    </sql>
+</mapper>

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * 预估费用
+ *
+ * @author hgw
+ * @date 2022-07-18 16:21:40
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tforecastlibrary")
+@Tag(name = "预估费用管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TForecastLibraryController {
+
+	private final TForecastLibraryService tForecastLibraryService;
+
+
+	/**
+	 * 简单分页查询
+	 *
+	 * @param page             分页对象
+	 * @param tForecastLibrary 预估费用
+	 * @return
+	 */
+	@Operation(description = "简单分页查询")
+	@GetMapping("/page")
+	public R<IPage<TForecastLibrary>> getTForecastLibraryPage(Page<TForecastLibrary> page, TForecastLibrary tForecastLibrary) {
+		return new R<>(tForecastLibraryService.getTForecastLibraryPage(page, tForecastLibrary));
+	}
+
+	/**
+	 * 不分页查询
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return
+	 */
+	@Operation(summary = "不分页查询", description = "不分页查询")
+	@PostMapping("/noPage")
+	//@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_get')" )
+	public R<List<TForecastLibrary>> getTForecastLibraryNoPage(@RequestBody TForecastLibrary tForecastLibrary) {
+		return R.ok(tForecastLibraryService.noPageDiy(tForecastLibrary));
+	}
+
+	/**
+	 * 通过id查询预估费用
+	 *
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tforecastlibrary_get')")
+	@GetMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_get')")
+	public R<TForecastLibrary> getById(@PathVariable("id") String id) {
+		return R.ok(tForecastLibraryService.getById(id));
+	}
+
+	/**
+	 * 新增预估费用
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return R
+	 */
+	@Operation(summary = "新增预估费用", description = "新增预估费用：hasPermission('social_tforecastlibrary_add')")
+	@SysLog("新增预估费用")
+	@PostMapping
+	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_add')")
+	public R<Boolean> save(@RequestBody TForecastLibrary tForecastLibrary) {
+		return R.ok(tForecastLibraryService.save(tForecastLibrary));
+	}
+
+	/**
+	 * 修改预估费用
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return R
+	 */
+	@Operation(summary = "修改预估费用", description = "修改预估费用：hasPermission('social_tforecastlibrary_edit')")
+	@SysLog("修改预估费用")
+	@PutMapping
+	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_edit')")
+	public R<Boolean> updateById(@RequestBody TForecastLibrary tForecastLibrary) {
+		return R.ok(tForecastLibraryService.updateById(tForecastLibrary));
+	}
+
+	/**
+	 * 通过id删除预估费用
+	 *
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除预估费用", description = "通过id删除预估费用：hasPermission('social_tforecastlibrary_del')")
+	@SysLog("通过id删除预估费用")
+	@DeleteMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_del')")
+	public R<Boolean> removeById(@PathVariable String id) {
+		return R.ok(tForecastLibraryService.removeById(id));
+	}
+
+	/**
+	 * 预估费用 批量导出
+	 *
+	 * @author hgw
+	 * @date 2022-07-18 16:21:40
+	 **/
+	@Operation(description = "导出预估费用 hasPermission('social_tforecastlibrary-export')")
+	@PostMapping("/export")
+	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary-export')")
+	public void export(HttpServletResponse response, @RequestBody TForecastLibrary searchVo) {
+		tForecastLibraryService.listExport(response, searchVo);
+	}
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 预估费用
+ *
+ * @author hgw
+ * @date 2022-07-18 16:21:40
+ */
+@Mapper
+public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
+	/**
+	 * 预估费用简单分页查询
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return
+	 */
+	IPage<TForecastLibrary> getTForecastLibraryPage(Page<TForecastLibrary> page, @Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * 预估费用
+ *
+ * @author hgw
+ * @date 2022-07-18 16:21:40
+ */
+public interface TForecastLibraryService extends IService<TForecastLibrary> {
+	/**
+	 * 预估费用简单分页查询
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return
+	 */
+	IPage<TForecastLibrary> getTForecastLibraryPage(Page<TForecastLibrary> page, TForecastLibrary tForecastLibrary);
+
+	void listExport(HttpServletResponse response, TForecastLibrary searchVo);
+
+	List<TForecastLibrary> noPageDiy(TForecastLibrary searchVo);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TForecastLibraryMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 预估费用
+ *
+ * @author hgw
+ * @date 2022-07-18 16:21:40
+ */
+@Log4j2
+@Service
+public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMapper, TForecastLibrary> implements TForecastLibraryService {
+	/**
+	 * 预估费用简单分页查询
+	 *
+	 * @param tForecastLibrary 预估费用
+	 * @return
+	 */
+	@Override
+	public IPage<TForecastLibrary> getTForecastLibraryPage(Page<TForecastLibrary> page, TForecastLibrary tForecastLibrary) {
+		return baseMapper.getTForecastLibraryPage(page, tForecastLibrary);
+	}
+
+	/**
+	 * 预估费用批量导出
+	 *
+	 * @param searchVo 预估费用
+	 * @return
+	 */
+	@Override
+	public void listExport(HttpServletResponse response, TForecastLibrary searchVo) {
+		String fileName = "预估费用批量导出" + DateUtil.getThisTime() + ".xlsx";
+		//获取要导出的列表
+		List<TForecastLibrary> list = new ArrayList<>();
+		long count = noPageCountDiy(searchVo);
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
+			response.setContentType("multipart/form-data");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
+			//EasyExcel.write(out, TEmpBadRecord.class).sheet("预估费用").doWrite(list)
+			ExcelWriter excelWriter = EasyExcel.write(out, TForecastLibrary.class).build();
+			int index = 0;
+			if (count > CommonConstants.ZERO_INT) {
+				for (int i = 0; i <= count; ) {
+					// 获取实际记录
+					searchVo.setLimitStart(i);
+					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
+					list = noPageDiy(searchVo);
+					if (Common.isNotNull(list)) {
+						ExcelUtil<TForecastLibrary> util = new ExcelUtil<>(TForecastLibrary.class);
+						for (TForecastLibrary vo : list) {
+							util.convertEntity(vo, null, null, null);
+						}
+					}
+					if (Common.isNotNull(list)) {
+						WriteSheet writeSheet = EasyExcel.writerSheet("预估费用" + index).build();
+						excelWriter.write(list, writeSheet);
+						index++;
+					}
+					i = i + CommonConstants.EXCEL_EXPORT_LIMIT;
+					if (Common.isNotNull(list)) {
+						list.clear();
+					}
+				}
+			} else {
+				WriteSheet writeSheet = EasyExcel.writerSheet("预估费用" + index).build();
+				excelWriter.write(list, writeSheet);
+			}
+			if (Common.isNotNull(list)) {
+				list.clear();
+			}
+			out.flush();
+			excelWriter.finish();
+		} catch (Exception e) {
+			log.error("执行异常", e);
+		} finally {
+			try {
+				if (null != out) {
+					out.close();
+				}
+			} catch (IOException e) {
+				log.error("执行异常", e);
+			}
+		}
+	}
+
+	@Override
+	public List<TForecastLibrary> noPageDiy(TForecastLibrary searchVo) {
+		LambdaQueryWrapper<TForecastLibrary> wrapper = buildQueryWrapper(searchVo);
+		if (Common.isNotNull(searchVo.getIdList())) {
+			wrapper.in(TForecastLibrary::getId, searchVo.getIdList());
+		}
+		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
+			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
+		}
+		wrapper.orderByDesc(BaseEntity::getCreateTime);
+		return baseMapper.selectList(wrapper);
+	}
+
+	private Long noPageCountDiy(TForecastLibrary searchVo) {
+		LambdaQueryWrapper<TForecastLibrary> wrapper = buildQueryWrapper(searchVo);
+		if (Common.isNotNull(searchVo.getIdList())) {
+			wrapper.in(TForecastLibrary::getId, searchVo.getIdList());
+		}
+		return baseMapper.selectCount(wrapper);
+	}
+
+	private LambdaQueryWrapper buildQueryWrapper(TForecastLibrary entity) {
+		LambdaQueryWrapper<TForecastLibrary> wrapper = Wrappers.lambdaQuery();
+		if (Common.isNotNull(entity.getCreateTimeStart())) {
+			wrapper.ge(TForecastLibrary::getCreateTime, entity.getCreateTimeStart());
+		}
+		if (Common.isNotNull(entity.getCreateTimeEnd())) {
+			wrapper.le(TForecastLibrary::getCreateTime, entity.getCreateTimeEnd());
+		}
+		if (Common.isNotNull(entity.getCreateName())) {
+			wrapper.eq(TForecastLibrary::getCreateName, entity.getCreateName());
+		}
+		return wrapper;
+	}
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TPreDispatchInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -50,9 +51,9 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMapper, TPreDispatchInfo> implements TPreDispatchInfoService {
 
-	private final SysBaseSetInfoMapper sysBaseSetInfoMapper;
+	@Autowired
+	private SysBaseSetInfoMapper sysBaseSetInfoMapper;
 
-	private final UpmsDaprUtils upmsDaprUtils;
 	/**
 	 * 预派单记录简单分页查询
 	 *
@@ -405,7 +406,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (null != errorMessage) {
 			return R.failed(errorMessage);
 		}
-		R<List<SysArea>> areaListR = upmsDaprUtils.getAreaListR();
+		R<List<SysArea>> areaListR = UpmsDaprUtils.getAreaListR();
 		if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
 			return R.failed(PreDispatchConstants.GET_AREA_INFO);
 		}