Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainListVo.java

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TSettleDomainListVo {
+
+	/**
+	 * 合同主体对应的单位名称
+	 */
+    private List<TSettleDomainSelectVo> listSelectVO;
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.archives.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
@@ -117,6 +118,17 @@ public class TEmpChangeInfoController {
         return R.ok(tEmpChangeInfoService.removeById(id));
     }
 
+	/**
+	 * 分页查询获取所有项目名称
+	 * @param page 分页对象
+	 * @return
+	 */
+	@Operation(description = "分页查询")
+	@GetMapping("/getAllDeptPage" )
+	public R<IPage<TSettleDomain>> getItemNamePage(Page page) {
+		return new R<>(tEmpChangeInfoService.getAllDeptPage(page));
+	}
+
 	/**
 	 * 获取所有项目名称
 	 * @return R
@@ -130,7 +142,6 @@ public class TEmpChangeInfoController {
 		return tEmpChangeInfoService.getAllDept();
 	}
 
-
 	/**
 	 * 获取所有单位名称
 	 * @return R

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -149,8 +149,8 @@ public class TSettleDomainController {
 	 **/
 	@Inner
 	@PostMapping("/getSettleDomainSelectVoById")
-	public R<TSettleDomainSelectVo> getInnerSettleDomainSelectVoByUserId(@RequestParam String id) {
-		return new R<>(tSettleDomainService.selectSettleDomainSelectVosById(id));
+	public TSettleDomainSelectVo getInnerSettleDomainSelectVoByUserId(@RequestParam String id) {
+		return tSettleDomainService.selectSettleDomainSelectVosById(id);
 	}
 
 	/**
@@ -161,8 +161,11 @@ public class TSettleDomainController {
 	 **/
 	@Inner
 	@PostMapping("/selectAllSettleDomainSelectVos")
-	public  R<List<TSettleDomainSelectVo>> selectAllSettleDomainSelectVos() {
-		return new R<>(tSettleDomainService.selectAllSettleDomainSelectVos());
+	public TSettleDomainListVo selectAllSettleDomainSelectVos() {
+		List<TSettleDomainSelectVo> list = tSettleDomainService.selectAllSettleDomainSelectVos();
+		TSettleDomainListVo listVo = new TSettleDomainListVo();
+		listVo.setListSelectVO(list);
+		return listVo;
 	}
 
 	/**

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

@@ -17,6 +17,8 @@
 
 package com.yifu.cloud.plus.v1.yifu.archives.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.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
@@ -66,4 +68,5 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
 	 */
 	R<List<TCustomerInfo>> getAllUint();
 
+	IPage<TSettleDomain> getAllDeptPage(Page page);
 }

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

@@ -17,18 +17,18 @@
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+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.pig4cloud.plugin.excel.vo.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpChangeInfo;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TCustomerInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
-import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
@@ -57,7 +57,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 
 	private final TCustomerInfoService tCustomerInfoService;
 
-	private final TSettleDomainService tSettleDomainService;
+	private final TSettleDomainMapper tSettleDomainMapper;
 
 	private final TEmployeeLogServiceImpl tEmployeeLogService;
 
@@ -89,7 +89,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL).eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT));
 		if (Common.isNotNull(updateTEmployeeProject)) {
 
-			TSettleDomain tSettleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
 					.eq(TSettleDomain::getDepartNo, tEmpChangeInfo.getDeptNo()).eq(TSettleDomain::getDepartName, tEmpChangeInfo.getNewSettle())
 					.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING).eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
 			TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(updateTEmployeeProject.getId());
@@ -149,7 +149,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			}
 
 			//项目编码校验
-			TSettleDomain tSettleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
 					.eq(TSettleDomain::getDepartNo, excel.getNewSettleCode())
 					.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING)
 					.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING));
@@ -217,7 +217,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	 */
 	@Override
 	public R<List<TSettleDomain>> getAllDept() {
-		List<TSettleDomain> list = tSettleDomainService.list(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
+		List<TSettleDomain> list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 				.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL));
 		return R.ok(list);
 	}
@@ -233,4 +233,23 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 		List<TCustomerInfo> list = tCustomerInfoService.list(Wrappers.<TCustomerInfo>query().lambda().eq(TCustomerInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
 		return R.ok(list);
 	}
+
+	/**
+	 * 分页获取所有项目名称
+	 * @return R
+	 * @Author huyc
+	 * @Date 2022-07-26
+	 */
+	@Override
+	public IPage<TSettleDomain> getAllDeptPage(Page page) {
+		LambdaQueryWrapper<TSettleDomain> wrapper = buildQueryWrapper();
+		return tSettleDomainMapper.selectPage(page,wrapper);
+	}
+
+	private LambdaQueryWrapper buildQueryWrapper() {
+		LambdaQueryWrapper<TSettleDomain> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING);
+		wrapper.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING);
+		return wrapper;
+	}
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -358,6 +358,20 @@ public interface CommonConstants {
 	// 是否
 	String IS_CHANGE = "划转";
 
+	/**
+	 * 省市
+	 * @Author fxj
+	 * @Date  2020-08-25
+	 **/
+	public static final  String HEFEISTRING="安徽省-合肥市";
+
+	/**
+	 * 省
+	 * @Author fxj
+	 * @Date  2020-08-25
+	 **/
+	public static final  String ANHUISTRING="安徽省";
+
 	/**
 	 *是所有者
 	 **/
@@ -378,6 +392,10 @@ public interface CommonConstants {
 	public static final String NINE_STRING = "9";
 	String EIGHT_STRING = "8";
 
+	public static final String PAYMENT_SOCIAL_IMPORT = "payment_social_import";
+
+	public static final String PAYMENT_SOCIAL_WAIT_EXPORT = "payment_social_wait_export";
+
 	//百分之一 1/100
 	public static final BigDecimal ONE_OF_PERCENT = new BigDecimal("0.01");
 
@@ -389,4 +407,8 @@ public interface CommonConstants {
 	String SEVEN_STRING = "7";
 
 	public static final BigDecimal MONEY_MAX = new BigDecimal("999999.99");
+
+	public static final String ERROR_MSG_PRFIX = "error=";
+
+	public static final String SUCCESS_MSG_PREFIX = "success=";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttributeConstants.java

@@ -126,4 +126,10 @@ public class ExcelAttributeConstants {
 	public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
 	//派减离职原因
 	public static final String REDUCE_PROJECT_REASON = "reduce_project_reason";
+
+	//社保缴纳月份
+	public static final String SOCIAL_PAY_MONTH = "socialPayMonth";
+
+	//身份证
+	public static final String EMPIDCARD = "empIdcard";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -416,4 +416,8 @@ public interface ErrorCodes {
 	 * 派减异常： 本次派增已存在对应身份证号的派减记录
 	 */
 	String EMP_DISPATCH_REDUCE_EXISTS = "emp.dispatch.reduce.exists";
+	/**
+	 * 当前社保导入队列不足或者数据量过大，请稍后重试！
+	 */
+	String SOCIALINFO_LIST_NUM_LARGE = "socialinfo.list.num.large";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java

@@ -399,4 +399,44 @@ public class Common {
 			map.clear();
 		}
 	}
+
+	/**
+	 * 按字段返回字符串
+	 *
+	 * @param list
+	 * @param filedName
+	 * @param <T>
+	 * @return
+	 */
+	public static <T> List<String> listObjectToStrList(List<T> list, String filedName) {
+		List<String> idsStr = new ArrayList<String>();
+		Object temp = null;
+		if (null != list && list.size() > 0) {
+			for (T t : list) {
+				temp = getFieldValueByName(filedName, t);
+				if (null != temp) {
+					idsStr.add(temp.toString());
+				}
+			}
+		}
+		return idsStr;
+	}
+
+	/**
+	 * 默认空 置为零
+	 * @param obj
+	 * @return
+	 */
+	public static BigDecimal isBlankToBigDecimalZero(BigDecimal obj) {
+		if(obj == null) {
+			return BigDecimal.ZERO;
+		}
+		if(String.valueOf(obj).trim().length() == 0) {
+			return BigDecimal.ZERO;
+		}
+		if(String.valueOf(obj).trim().equals("null")) {
+			return BigDecimal.ZERO;
+		}
+		return obj;
+	}
 }

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -151,6 +151,8 @@ emp.dispatch.reduce.fund.status.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672A\u627
 
 emp.dispatch.reduce.exists=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672C\u6B21\u6D3E\u589E\u5DF2\u5B58\u5728\u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u53F7\u7684\u6D3E\u51CF\u8BB0\u5F55
 
+socialinfo.list.num.large=\u5F53\u524D\u793E\u4FDD\u5BFC\u5165\u961F\u5217\u4E0D\u8DB3\u6216\u8005\u6570\u636E\u91CF\u8FC7\u5927\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01
+
 
 
 

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

@@ -96,8 +96,8 @@ public class ArchivesDaprUtil {
 	 * @Param
 	 * @return
 	 **/
-	public R<List<TSettleDomainSelectVo>> selectAllSettleDomainSelectVos(){
-		R<List<TSettleDomainSelectVo>> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainSelectVoById","", Map.class, SecurityConstants.FROM_IN);
+	public R<TSettleDomainListVo> selectAllSettleDomainSelectVos(){
+		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/selectAllSettleDomainSelectVos","", Map.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){
 			return R.failed("获取所有客户单位的结算主体信息失败！");
 		}

yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil,\
-    com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils,\
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil

yifu-insurances/yifu-insurances-biz/pom.xml

@@ -65,11 +65,6 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
-        <dependency>
-            <groupId>com.yifu.cloud.plus.v1</groupId>
-            <artifactId>yifu-check-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
 
 	<build>

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Sets;
 import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
-import com.yifu.cloud.plus.v1.check.utils.ChecksUtil;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
@@ -18,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
@@ -35,8 +35,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotBlank;
-import java.sql.Array;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -69,6 +67,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private TInsuranceSettleService tInsuranceSettleService;
 	@Resource
 	private TInsuranceOperateService tInsuranceOperateService;
+	@Resource
+	private CheckDaprUtil checkDaprUtil;
 
 
 	/***********************商险办理********************************/
@@ -713,11 +713,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
-				param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
-				listResult.add(param);
-				continue;
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
+					param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
+					listResult.add(param);
+					continue;
+				}
 			}
 
 			//根据项目编码查询项目是否存在
@@ -962,11 +965,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
-				param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
-				listResult.add(param);
-				continue;
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
+					param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
+					listResult.add(param);
+					continue;
+				}
 			}
 
 			//根据项目编码查询项目是否存在
@@ -1200,12 +1206,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
-				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
-				listResult.add(param);
-				continue;
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
+					param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
+					listResult.add(param);
+					continue;
+				}
 			}
+
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				param.setErrorMessage(InsurancesConstants.POLICY_START_PARSE_ERROR);
 				listResult.add(param);

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java

@@ -481,13 +481,6 @@ public class TForecastLibrary extends BaseEntity {
 	@Length(max = 50, message = "公积金户不能超过50个字符")
 	@ExcelProperty("公积金户")
 	private String providentHouseholdName;
-	/**
-	 * 公积金编号
-	 */
-	@ExcelAttribute(name = "公积金编号", maxLength = 50)
-	@Length(max = 50, message = "公积金编号不能超过50个字符")
-	@ExcelProperty("公积金编号")
-	private String providentNo;
 	/**
 	 * 数据同步：0未同步；1已同步
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java

@@ -636,9 +636,9 @@ public class TPreDispatchInfo extends BaseEntity {
     private String remark;
 
     /**
-     * 是否派单：0 是 2 否 
+     * 是否派单：0 是 1 否
      */
-    @Schema(description ="是否派单：0 是 2 否 ")
+    @Schema(description ="是否派单：0 是 1 否 ")
     private String dispatchFlag;
 
     /**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java

@@ -460,6 +460,7 @@ public class TSocialFundInfo extends BaseEntity {
 	private BigDecimal unitBigailmentPer;
 	/**
 	 * 社保停缴日期
+	 * 社保减少日期
 	 */
 	@ExcelAttribute(name = "社保停缴日期", isDate = true)
 	@Schema(description = "社保停缴日期" )

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java

@@ -494,7 +494,7 @@ public class TPreDispatchExportVo implements Serializable {
 	private String remark;
 
 	/**
-	 * 是否派单：0 是 2 否
+	 * 是否派单：0 是 1 否
 	 */
 	@ExcelProperty(value ="是否派单")
 	@ExcelAttribute(name = "是否派单", maxLength = 2, needExport = true, readConverterExp = "0=是,1=否")

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java

@@ -42,13 +42,13 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
 	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, maxLength = 20, needExport = true, errorInfo = "员工姓名必填且不可超过20位")
 	@Schema(description = "员工姓名")
 	@ExcelProperty("员工姓名")
-	private String name;
+	private String empName;
 
 	@Length(max = 20, message = "身份证号 不能超过20 个字符")
 	@ExcelAttribute(name = "身份证号", isNotEmpty = true, maxLength = 20, needExport = true, errorInfo = "身份证号必填且不可超过20位")
 	@Schema(description = "身份证号")
 	@ExcelProperty("身份证号")
-	private String idCard;
+	private String empIdcard;
 
 	@ExcelAttribute(name = "缴纳类型", isNotEmpty = true, errorInfo = "缴纳类型必填", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
 	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
@@ -58,23 +58,27 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
 	@ExcelAttribute(name = "养老基数")
 	@Schema(description = "养老基数")
 	@ExcelProperty("养老基数")
-	private BigDecimal unitPensionBase;
+	private BigDecimal unitPensionCardinal;
+
 	@ExcelAttribute(name = "医疗基数")
 	@Schema(description = "医疗基数")
 	@ExcelProperty("医疗基数")
-	private BigDecimal unitMedicalBase;
+	private BigDecimal unitMedicalCardinal;
+
 	@ExcelAttribute(name = "失业基数")
 	@Schema(description = "失业基数")
 	@ExcelProperty("失业基数")
-	private BigDecimal unitUnemploymentBase;
+	private BigDecimal unitUnemploymentCardinal;
+
 	@ExcelAttribute(name = "工伤基数")
 	@Schema(description = "工伤基数")
 	@ExcelProperty("工伤基数")
-	private BigDecimal unitInjuryBase;
+	private BigDecimal unitWorkInjuryCardinal;
+
 	@ExcelAttribute(name = "生育基数")
 	@Schema(description = "生育基数")
 	@ExcelProperty("生育基数")
-	private BigDecimal unitBirthBase;
+	private BigDecimal unitBirthCardinal;
 
 	@ExcelAttribute(name = "单位大病救助金额")
 	@Schema(description = "单位大病救助金额")

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

@@ -159,7 +159,7 @@ public class TForecastLibraryController {
 	@SysLog("按缴纳月重新生成")
 	@PostMapping("/createForecastlibary")
 	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_create')")
-	public R<Boolean> createForecastlibary(@RequestParam String payMonths,
+	public R<String> createForecastlibary(@RequestParam String payMonths,
 										   @RequestParam(value = "empIdCard", required = false) String empIdCard,
 										   @RequestParam(value = "settleDomainIds", required = false) String settleDomainIds) {
 		if (Common.isEmpty(empIdCard) && Common.isEmpty(settleDomainIds)) {

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

@@ -225,7 +225,7 @@ public class TPreDispatchInfoController {
 	@Operation(summary = "预派单批量新增派增", description = "预派单批量新增派增")
 	@SysLog("预派单批量新增派增")
 	@PostMapping("/analysisJsonStringImportAdd")
-	@PreAuthorize("@pms.hasPermission('social:tpredispatchinfo_importAddList')")
+	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_importAddList')")
 	public R analysisJsonStringImportAdd(@RequestBody String jsonString, @RequestParam(value = "socialHouse",required = false) String socialHouse,
 										 @RequestParam(value = "fundHouse",required = false) String fundHouse, @RequestParam String departId) {
 		YifuUser user = SecurityUtils.getUser();
@@ -265,7 +265,7 @@ public class TPreDispatchInfoController {
 	@Operation(summary = "预派单批量新增派减", description = "预派单批量新增派减")
 	@SysLog("预派单批量新增派减")
 	@PostMapping("/analysisJsonStringImportReduce")
-	@PreAuthorize("@pms.hasPermission('social:tpredispatchinfo_importReduceList')")
+	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_importAddList')")
 	public R analysisJsonStringImportReduce(@RequestBody String jsonString) {
 		YifuUser user = SecurityUtils.getUser();
 		if (null == user || null == user.getId()) {

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

@@ -27,11 +27,9 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
 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;

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

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 
+import java.util.Map;
+
 /**
  * 基数设置表
  *
@@ -56,4 +58,13 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> {
 	 **/
 	R<String> updateSysBase(SysBaseSetInfo sysBaseSetInfo);
 
+	/**
+	 * @param
+	 * @Description: 获取社保基数配置的Map
+	 * @Author: hgw
+	 * @Date: 2020/10/27 16:44
+	 * @return: java.util.Map<java.lang.String, com.yifu.cloud.v1.hrms.api.entity.SysBaseSetInfo>
+	 **/
+	Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType);
+
 }

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

@@ -57,16 +57,15 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 * @Date: 2022/7/18 17:11
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
 	 **/
-	R<Boolean> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds);
+	R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds);
 
 	/**
-	 * @Description: 填充预估实际金额
+	 * @param socialFundInfo
+	 * @Description: 批量调基，同步预估库
 	 * @Author: hgw
-	 * @Date: 2020/10/10 16:45
-	 * @return: com.yifu.cloud.v1.hrms.api.entity.TForecastLibrary
+	 * @Date: 2022/7/25 17:33
+	 * @return: void
 	 **/
-	TForecastLibrary initForecastLibrary(TForecastLibrary library
-			, TSocialFundInfo socialInfo, TSocialFundInfo fund, Integer month, boolean isReduceFund
-			, boolean isReduceSocial, HashMap<String, TAgentConfig> agentConfigMap);
+	R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo);
 
 }

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

@@ -34,8 +34,11 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TSocialLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 基数设置表
@@ -261,4 +264,31 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			}
 		}
 	}
+
+	@Override
+	public Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType) {
+		// 基数配置
+		SysBaseSetInfo sysBaseSetInfo = new SysBaseSetInfo();
+		sysBaseSetInfo.setBaseType(baseType);
+		sysBaseSetInfo.setDeleteFlag(CommonConstants.STATUS_NORMAL);
+		sysBaseSetInfo.setStatus(CommonConstants.ZERO_INT);
+		sysBaseSetInfo.setApplyStartDate(new Date());
+		// 查询符合条件的基数列表
+		List<SysBaseSetInfo> sysBaseSetInfoList = baseMapper.getSysBaseSetInfoNoPage(sysBaseSetInfo);
+		// 返回的map
+		Map<String, SysBaseSetInfo> setInfoMap = new HashMap<>();
+		if (sysBaseSetInfoList != null && !sysBaseSetInfoList.isEmpty()) {
+			// map的键
+			String key;
+			for (SysBaseSetInfo setInfo : sysBaseSetInfoList) {
+				key = setInfo.getDepartId() + CommonConstants.DOWN_LINE_STRING + setInfo.getProvince()
+						+ CommonConstants.DOWN_LINE_STRING + setInfo.getCity();
+				if (setInfo.getTown() != null) {
+					key += CommonConstants.DOWN_LINE_STRING + setInfo.getTown();
+				}
+				setInfoMap.put(key, setInfo);
+			}
+		}
+		return setInfoMap;
+	}
 }

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

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
@@ -323,14 +324,21 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (Common.isEmpty(id)) {
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}
-		R<List<TSettleDomainSelectVo>> settleDomainR = null;
+		List<TSettleDomainSelectVo> settleDomainR = null;
+		R<TSettleDomainListVo> listVo = null;
 		//结算主体名称map key:结算主体id value:结算主体名称
 		Map<String, String> settleDomainNameMap = new HashMap<>();
 		//客户名称map key:客户id value:客户名称
 		Map<String, String> customerNameMap = new HashMap<>();
 		//结算主体客户关系map key:结算主体id value:客户id
 		Map<String, String> settleIdAndCustomerIdMap = new HashMap<>();
-		settleDomainR = archivesDaprUtil.selectAllSettleDomainSelectVos();
+		listVo = archivesDaprUtil.selectAllSettleDomainSelectVos();
+		if (Common.isNotNull(listVo)) {
+			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
+			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
+				settleDomainR = tSettleDomainListVo.getListSelectVO();
+			}
+		}
 		//map数据封装
 		initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap);
 		TPreDispatchInfo preInfo = baseMapper.selectById(id);
@@ -388,14 +396,21 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (null == user || null == user.getId()) {
 			return R.failed(CommonConstants.USER_FAIL);
 		}
-		R<List<TSettleDomainSelectVo>> settleDomainR = null;
+		List<TSettleDomainSelectVo> settleDomainR = null;
+		R<TSettleDomainListVo> listVo = null;
 		//结算主体名称map key:结算主体id value:结算主体名称
 		Map<String, String> settleDomainNameMap = new HashMap<>();
 		//客户名称map key:客户id value:客户名称
 		Map<String, String> customerNameMap = new HashMap<>();
 		//结算主体客户关系map key:结算主体id value:客户id
 		Map<String, String> settleIdAndCustomerIdMap = new HashMap<>();
-		settleDomainR = archivesDaprUtil.selectAllSettleDomainSelectVos();
+		listVo = archivesDaprUtil.selectAllSettleDomainSelectVos();
+		if (Common.isNotNull(listVo)) {
+			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
+			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
+				settleDomainR = tSettleDomainListVo.getListSelectVO();
+			}
+		}
 		//map数据封装
 		initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap);
 		// 获取当前创建人 截止到当前时间的 正常未派单 未删除的预派单数据
@@ -480,6 +495,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 
 	@Override
 	public R update(TPreDispatchInfo tPreDispatchInfo) {
+
 		YifuUser user = SecurityUtils.getUser();
 		if (null == user || null == user.getId()) {
 			return R.failed(CommonConstants.USER_FAIL);
@@ -549,7 +565,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 	public List<ErrorMessage> batchSavePreDisPatchAdd(List<TPreDispatchInfo> listInfo, YifuUser user, String socialHouse, String fundHouse, String departId) {
 		List<ErrorMessage> errorList = new ArrayList<>();
 		R<TSettleDomainSelectVo> domainR = archivesDaprUtil.getSettleDomainSelectVoById(departId);
-		TSettleDomainSelectVo selectVo = domainR.getData();
 		// 获取区域数据MAP
 		HashMap<String, SysArea> areaHashMap = new HashMap<>(CommonConstants.SIXTEEN_INT);
 		HashMap<String, SysArea> areaIdMap = new HashMap<>(CommonConstants.SIXTEEN_INT);
@@ -559,6 +574,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (dataCheckDepart(errorList, domainR)) {
 			return errorList;
 		}
+		TSettleDomainSelectVo selectVo = domainR.getData();
 		// 获取基数配置信息
 		HashMap<String, SysBaseSetInfo> baseSocialSetMap = new HashMap<>();
 		HashMap<String, SysBaseSetInfo> baseFundSetMap = new HashMap<>();
@@ -653,8 +669,10 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			initDayLimit(dayConfMap, info);
 			// 5.保存  有异常也保存  要做标识
 			R<TSettleDomainSelectVo> domainR = archivesDaprUtil.getSettleDomainSelectVoById(user.getDeptId().toString());
-			TSettleDomainSelectVo selectVo = domainR.getData();
-			info.setUserDeptName(selectVo.getDepartName());
+			if (Common.isNotNull(domainR) && Common.isNotNull(domainR.getData())) {
+				TSettleDomainSelectVo selectVo = domainR.getData();
+				info.setUserDeptName(selectVo.getDepartName());
+			}
 			info.setPreStatus(CommonConstants.ZERO_STRING);
 			// 如果已经存在未派单的派增 这个时候派减 直接标记异常 客服自行判断是否派单
 			if (null != preAddMap.get(info.getEmpIdcard())) {
@@ -1041,10 +1059,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		// 默认社保代理 4
 		info.setEmpTypeAdd(CommonConstants.FOUR_STRING);
 		info.setPositionAdd(PreDispatchConstants.POSITION);
-		info.setDepartIdAdd(selectVo.getId());
-		info.setDepartNameAdd(selectVo.getDepartName());
-		info.setUnitIdAdd(selectVo.getCustomerId());
-		info.setUnitNameAdd(selectVo.getCustomerName());
+		if (Common.isNotNull(selectVo)) {
+			info.setDepartIdAdd(selectVo.getId());
+			info.setDepartNameAdd(selectVo.getDepartName());
+			info.setUnitIdAdd(selectVo.getCustomerId());
+			info.setUnitNameAdd(selectVo.getCustomerName());
+		}
 		// 默认合同名称为代理社保 合同类型为固定期限1
 		info.setContractNameAdd(PreDispatchConstants.CONTRACT_NAME);
 		info.setContractTypeAdd(CommonConstants.ONE_STRING);
@@ -1847,7 +1867,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 	/**
 	 * map数据封装
 	 *
-	 * @param settleDomainR
+	 * @param settleDomainList
 	 * @param settleDomainNameMap
 	 * @param customerNameMap
 	 * @param settleIdAndCustomerIdMap
@@ -1855,13 +1875,10 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 	 * @Author huyc
 	 * @Date 2022-07-18
 	 **/
-	private void initSettleDomainMaps(R<List<TSettleDomainSelectVo>> settleDomainR,
+	private void initSettleDomainMaps(List<TSettleDomainSelectVo> settleDomainList,
 									  Map<String, String> settleDomainNameMap,
 									  Map<String, String> customerNameMap,
 									  Map<String, String> settleIdAndCustomerIdMap) {
-		List<TSettleDomainSelectVo> settleDomainList;
-		if (null != settleDomainR) {
-			settleDomainList = settleDomainR.getData();
 			//map数据封装
 			if (Common.isNotNull(settleDomainList)) {
 				for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
@@ -1872,7 +1889,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 					}
 				}
 			}
-		}
 	}
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java

 package com.yifu.cloud.plus.v1.yifu.social.util;
 
+import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 公用方法提取
@@ -56,4 +58,40 @@ public class ServiceUtil {
 		}
 		return  null;
 	}
+
+	/**
+	 * 抛个异常先
+	 * @Author fxj
+	 * @Date 2020-09-09
+	 * @param errorInfo
+	 * @return
+	 **/
+	public static void runTimeExceptionDiy(String errorInfo) {
+		throw new CheckedException(errorInfo);
+	}
+
+	/**
+	 * 参数2的是否大于等于参数1的
+	 * @Author fxj
+	 * @Date 20200403
+	 * @param socialStartDate
+	 * @param socialPayMonth
+	 * @param reduceDate
+	 * @return
+	 **/
+	public static boolean checkMothForPaymentImport(Date socialStartDate, String socialPayMonth, Date reduceDate) {
+		if(socialStartDate != null) {
+			if (null == reduceDate){
+				if(Integer.parseInt(socialPayMonth) >= Integer.parseInt(DateUtil.dateToString(socialStartDate))){
+					return true;
+				}
+			}else {
+				if(Integer.parseInt(socialPayMonth) >= Integer.parseInt(DateUtil.dateToString(socialStartDate))
+						&& Integer.parseInt(socialPayMonth) < Integer.parseInt(DateUtil.dateToString(reduceDate))){
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 }

yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml

@@ -161,6 +161,10 @@
 			<if test="sysBaseSetInfo.applyStartDate != null">
 				AND a.APPLY_START_DATE = #{sysBaseSetInfo.applyStartDate}
 			</if>
+			<if test="sysBaseSetInfo.applyStartDate != null">
+				AND a.APPLY_START_DATE <![CDATA[ <= ]]> #{sysBaseSetInfo.applyStartDate}
+				AND (a.APPLY_END_DATE is null or a.APPLY_END_DATE <![CDATA[ >= ]]> #{sysBaseSetInfo.applyStartDate})
+			</if>
 			<if test="sysBaseSetInfo.applyEndDate != null">
 				AND a.APPLY_END_DATE = #{sysBaseSetInfo.applyEndDate}
 			</if>

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchDayConfMapper.xml

@@ -34,6 +34,7 @@
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="createName" column="CREATE_NAME"/>
     <result property="updateTime" column="UPDATE_TIME"/>
+    <result property="createTime" column="CREATE_TIME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -45,7 +46,8 @@
                 a.CREATE_BY,
                 a.UPDATE_BY,
                 a.CREATE_NAME,
-                a.UPDATE_TIME
+                a.UPDATE_TIME,
+				a.CREATE_TIME
     </sql>
     <sql id="tDispatchDayConf_where">
         <if test="tDispatchDayConf != null">
@@ -79,6 +81,9 @@
                     <if test="tDispatchDayConf.updateTime != null">
                         AND a.UPDATE_TIME = #{tDispatchDayConf.updateTime}
                     </if>
+					<if test="tDispatchDayConf.createTime != null">
+						AND a.CREATE_TIME = #{tDispatchDayConf.createTime}
+					</if>
         </if>
     </sql>
     <!--tDispatchDayConf简单分页查询-->

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -92,7 +92,6 @@
 		<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
 		<result property="providentHousehold" column="PROVIDENT_HOUSEHOLD"/>
 		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
-		<result property="providentNo" column="PROVIDENT_NO"/>
 		<result property="dataPush" column="DATA_PUSH"/>
 		<result property="dataType" column="DATA_TYPE"/>
 		<result property="createBy" column="CREATE_BY"/>
@@ -170,7 +169,6 @@
 		a.SOCIAL_HOUSEHOLD_NAME,
 		a.PROVIDENT_HOUSEHOLD,
 		a.PROVIDENT_HOUSEHOLD_NAME,
-		a.PROVIDENT_NO,
 		a.DATA_PUSH,
 		a.DATA_TYPE,
 		a.CREATE_BY,
@@ -391,9 +389,6 @@
 			<if test="tForecastLibrary.providentHouseholdName != null and tForecastLibrary.providentHouseholdName.trim() != ''">
 				AND a.PROVIDENT_HOUSEHOLD_NAME = #{tForecastLibrary.providentHouseholdName}
 			</if>
-			<if test="tForecastLibrary.providentNo != null and tForecastLibrary.providentNo.trim() != ''">
-				AND a.PROVIDENT_NO = #{tForecastLibrary.providentNo}
-			</if>
 			<if test="tForecastLibrary.dataPush != null">
 				AND a.DATA_PUSH = #{tForecastLibrary.dataPush}
 			</if>