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

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

@@ -18,6 +18,8 @@ public class UpdateEmpVo implements Serializable {
 	String projectNo;
 	// 合同ID
 	String contractId;
+	// 备注
+	String remarkTemp;
 
 	// type 0 审核通过  2.审核不通过
 	String type;

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

@@ -2206,7 +2206,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							c.setInUse(CommonConstants.ZERO_STRING);
 							c.setAuditTimeLast(LocalDateTime.now());
 							contractAudit.setAuditStatus("审核通过");
-							contractAudit.setRemark("派单审核通过,同步审核通过合同");
+							contractAudit.setRemark(vo.getRemarkTemp());
 							contractAudit.setRootName("合同审核");
 							contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
 							//审核不同
@@ -2214,7 +2214,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							c.setAuditStatus(CommonConstants.THREE_INT);
 							c.setInUse(CommonConstants.ONE_STRING);
 							contractAudit.setAuditStatus("审核不通过");
-							contractAudit.setRemark("派单审核不通过,同步审核不通过合同");
+							contractAudit.setRemark(vo.getRemarkTemp());
 							contractAudit.setRootName("合同审核");
 						}
 						contractAuditMapper.insert(contractAudit);

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

@@ -205,7 +205,7 @@ public class ArchivesDaprUtil {
 	 * @Param type 0 审核通过  1 审核不通过
 	 * @return
 	 **/
-	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type){
+	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type,String remarkTemp){
 		if (Common.isEmpty(empIdCard)
 				|| Common.isEmpty(projectNo)
 				|| Common.isEmpty(type)){
@@ -215,6 +215,7 @@ public class ArchivesDaprUtil {
 		vo.setEmpIdCard(empIdCard);
 		vo.setProjectNo(projectNo);
 		vo.setContractId(contractId);
+		vo.setRemarkTemp(remarkTemp);
 		vo.setType(type);
 		R<Boolean> res = HttpDaprUtil.invokeMethodPost(
 				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()

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

@@ -920,6 +920,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setMId(mId);
 		}
 		param.setCreateBy(user.getId());
+		//设置updateBy字段是给导出使用的
+		param.setUpdateBy(user.getId());
 		menuUtil.setAuthSql(user, param);
 		if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) {
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
@@ -927,7 +929,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<InsuranceExportListVO> insuranceExportList;
 		//如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null
 		if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){
-			param.setCreateBy(null);
+			param.setUpdateBy(null);
 		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){

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

@@ -407,8 +407,8 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
-		<if test="param.createBy != null and param.createBy.trim() != ''">
-			and a.HANDLED_BY = #{param.createBy}
+		<if test="param.updateBy != null and param.updateBy.trim() != ''">
+			and a.HANDLED_BY = #{param.updateBy}
 		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}

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

@@ -76,12 +76,6 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty("项目名称")
 	private String settleDomainName;
 
-	@ExcelAttribute(name = "项目编码", maxLength = 50)
-	@Schema(description = "项目编码")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("项目编码")
-	private String settleDomainCode;
-
 	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@Schema(description = "员工类型")
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -102,6 +96,7 @@ public class TDispatchInfoExportVo {
 	 */
 	@ExcelAttribute(name = "业务细分", dataType = ExcelAttributeConstants.PERSONNEL_TYPE_SUB, needExport = true)
 	@Schema(description = "业务细分（存lable）", name = "contractName")
+	@ExcelProperty(value ="业务细分")
 	private String contractSubName;
 
 	/**
@@ -116,6 +111,7 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 合同起始时间
 	 */
+	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "合同起始时间", isDate = true)
 	@Schema(description = "合同起始时间" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -124,6 +120,7 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 合同到期时间
 	 */
+	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "合同到期时间", isDate = true)
 	@Schema(description = "合同到期时间" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -237,10 +234,10 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 审核状态（0待审核/1已审核）
 	 */
-	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=待审核,1=已审核")
+	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未审核,1=审核通过,2=审核不通过")
 	@Schema(description = "公积金审核状态:（0待审核/1已审核）" )
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金审核状态（0待审核/1已审核）" )
+	@ExcelProperty("公积金审核状态" )
 	private String fundAuditStatus;
 
 	/**
@@ -266,7 +263,7 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "公积金办理人" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金办理人" )
-	private String fundhHandleUser;
+	private String fundHandleUser;
 	/**
 	 * 公积金办理时间
 	 */
@@ -283,7 +280,7 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "养老基数" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("养老基数" )
-	private BigDecimal pensionCardinal;
+	private BigDecimal unitPensionCardinal;
 	/**
 	 * 医疗基数
 	 */
@@ -291,7 +288,7 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "医疗基数" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("医疗基数" )
-	private BigDecimal medicalCardinal;
+	private BigDecimal unitMedicalCardinal;
 	/**
 	 * 失业基数
 	 */
@@ -299,7 +296,7 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "失业基数" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("失业基数" )
-	private BigDecimal unemploymentCardinal;
+	private BigDecimal unitUnemploymentCardinal;
 
 	/**
 	 * 工伤基数
@@ -308,7 +305,7 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "工伤基数" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("工伤基数" )
-	private BigDecimal workInjuryCardinal;
+	private BigDecimal unitWorkInjuryCardinal;
 	/**
 	 * 生育基数
 	 */
@@ -316,7 +313,16 @@ public class TDispatchInfoExportVo {
 	@Schema(description = "生育基数" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("生育基数" )
-	private BigDecimal birthCardinal;
+	private BigDecimal unitBirthCardinal;
+
+	/**
+	 * 大病基数
+	 */
+	@ExcelAttribute(name = "大病基数" ,  isFloat = true,max = "999999999.99" )
+	@Schema(description = "大病基数" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病基数" )
+	private BigDecimal unitBigailmentCardinal;
 
 	/**
 	 * 委托备注
@@ -328,15 +334,6 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty("委托备注" )
 	private String trustRemark;
 
-	/**
-	 * 大病基数
-	 */
-	@ExcelAttribute(name = "大病基数" ,  isFloat = true,max = "999999999.99" )
-	@Schema(description = "大病基数" )
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("大病基数" )
-	private BigDecimal bigailmentCardinal;
-
 	/**
 	 * 离职日期
 	 */

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

@@ -29,6 +29,7 @@ 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.admin.api.vo.AllUserNaVo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
@@ -42,6 +43,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 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.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
@@ -104,6 +106,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@Autowired
 	private final CheckDaprUtil checkDaprUtil;
 
+	@Autowired
+	private UpmsDaprUtils upmsDaprUtils;
+
 	private final TForecastLibraryService forecastLibraryService;
 
 	private final TIncomeDetailService detailService;
@@ -143,7 +148,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		List<TDispatchInfoExportVo> list = new ArrayList<>();
 		long count = noPageCountDiy(searchVo);
 		ServletOutputStream out = null;
+		HashMap<String,String> userMap = new HashMap<>();
 		try {
+			R<AllUserNaVo> userListR = upmsDaprUtils.getAllUserName();
+			if (Common.isNotNull(userListR)) {
+				AllUserNaVo userList = userListR.getData();
+				if (null != userList && !userList.getUserNames().isEmpty()) {
+					userMap = userList.getUserNames();
+				}
+			}
 			out = response.getOutputStream();
 			response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
 			response.setCharacterEncoding("utf-8");
@@ -162,6 +175,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (Common.isNotNull(list)) {
 						util = new ExcelUtil<>(TDispatchInfoExportVo.class);
 						for (TDispatchInfoExportVo vo : list) {
+							if (!userMap.isEmpty()) {
+								vo.setFundHandleUser(null != userMap.get(vo.getFundHandleUser()) ? userMap.get(vo.getFundHandleUser()) : "");
+								vo.setAuditUserName(null != userMap.get(vo.getAuditUserName()) ? userMap.get(vo.getAuditUserName()) : "");
+								vo.setFundAuditUser(null != userMap.get(vo.getFundAuditUser()) ? userMap.get(vo.getFundAuditUser()) : "");
+								vo.setHandleUser(null != userMap.get(vo.getHandleUser()) ? userMap.get(vo.getHandleUser()) : "");
+							}
 							util.convertEntity(vo, null, null, null);
 						}
 					}
@@ -3026,10 +3045,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
 						R<Boolean> res = null;
 						if (CommonConstants.ZERO_INT == flag){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING,remarkTemp);
 						}
 						if (CommonConstants.ONE_INT == flag){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
 
 							// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
 							flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())

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

@@ -110,7 +110,6 @@
 		<result property="empType" column="EMP_TYPE"/>
 		<result property="belongUnitName" column="BELONG_UNIT_NAME"/>
 		<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
-		<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
 		<result property="type" column="TYPE"/>
 		<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
 		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
@@ -125,6 +124,40 @@
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="organName" column="ORGAN_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
+		<result property="contractType" column="CONTRACT_TYPE"/>
+		<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
+		<result property="contractTerm" column="CONTRACT_TERM"/>
+		<result property="contractStart" column="CONTRACT_START"/>
+		<result property="contractEnd" column="CONTRACT_END"/>
+		<result property="auditUserName" column="AUDIT_USER_NAME"/>
+		<result property="auditRemark" column="AUDIT_REMARK"/>
+		<result property="trustRemark" column="TRUST_REMARK"/>
+		<result property="leaveDate" column="LEAVE_DATE"/>
+		<result property="reduceReason" column="REDUCE_REASON"/>
+		<result property="status" column="STATUS"/>
+		<result property="auditUser" column="AUDIT_USER"/>
+		<result property="auditTime" column="AUDIT_TIME"/>
+		<result property="fundHandleRemark" column="FUND_HANDLE_REMARK"/>
+		<result property="socialHandleRemark" column="SOCIAL_HANDLE_REMARK"/>
+
+		<result property="providentStart" column="PROVIDENT_START"/>
+		<result property="fundAuditStatus" column="FUND_AUDIT_STATUS"/>
+		<result property="fundAuditUser" column="FUND_AUDIT_USER"/>
+		<result property="fundHandleUser" column="FUND_HANDLE_USER"/>
+		<result property="fundHandleTime" column="FUND_HANDLE_TIME"/>
+
+		<result property="auditStatus" column="AUDIT_STATUS"/>
+		<result property="socialStartDate" column="SOCIAL_START_DATE"/>
+		<result property="socialReduceDate" column="SOCIAL_REDUCE_DATE"/>
+		<result property="recordBase" column="RECORD_BASE"/>
+		<result property="handleUser" column="HANDLE_USER"/>
+		<result property="handleTime" column="HANDLE_TIME"/>
+		<result property="unitPensionCardinal" column="UNIT_PENSION_CARDINAL"/>
+		<result property="unitMedicalCardinal" column="UNIT_MEDICAL_CARDINAL"/>
+		<result property="unitUnemploymentCardinal" column="UNIT_UNEMPLOYMENT_CARDINAL"/>
+		<result property="unitBigailmentCardinal" column="UNIT_BIGAILMENT_CARDINAL"/>
+		<result property="unitWorkInjuryCardinal" column="UNIT_WORK_INJURY_CARDINAL"/>
+		<result property="unitBirthCardinal" column="UNIT_BIRTH_CARDINAL"/>
 	</resultMap>
 
 	<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
@@ -570,7 +603,6 @@
 			a.EMP_TYPE,
 			a.BELONG_UNIT_NAME,
 			a.SETTLE_DOMAIN_NAME,
-			a.SETTLE_DOMAIN_CODE,
 			a.TYPE,
 			a.SOCIAL_HOUSEHOLD_NAME,
 			a.PROVIDENT_HOUSEHOLD_NAME,
@@ -584,9 +616,42 @@
 			a.FUND_HANDLE_STATUS,
 			a.CREATE_NAME,
 			a.ORGAN_NAME,
-			a.CREATE_TIME
+			a.CREATE_TIME,
+			a.CONTRACT_TYPE,
+			a.CONTRACT_SUB_NAME,
+			a.CONTRACT_TERM,
+			a.CONTRACT_START,
+			a.CONTRACT_END,
+			a.AUDIT_REMARK,
+			a.TRUST_REMARK,
+			a.LEAVE_DATE,
+			a.REDUCE_REASON,
+			a.STATUS,
+			a.AUDIT_USER_NAME as AUDIT_USER,
+			a.AUDIT_TIME,
+			a.FUND_HANDLE_REMARK,
+			a.SOCIAL_HANDLE_REMARK,
+			c.PROVIDENT_START,
+			c.AUDIT_STATUS as FUND_AUDIT_STATUS,
+			c.AUDIT_USER as FUND_AUDIT_USER,
+			c.HANDLE_USER as FUND_HANDLE_USER,
+			c.HANDLE_TIME as FUND_HANDLE_TIME,
+			s.AUDIT_USER as AUDIT_USER_NAME,
+			s.AUDIT_STATUS,
+			s.SOCIAL_START_DATE,
+			s.SOCIAL_REDUCE_DATE,
+			s.RECORD_BASE,
+			s.HANDLE_USER,
+			s.HANDLE_TIME,
+			s.UNIT_PENSION_CARDINAL,
+			s.UNIT_MEDICAL_CARDINAL,
+			s.UNIT_UNEMPLOYMENT_CARDINAL,
+			s.UNIT_BIGAILMENT_CARDINAL,
+			s.UNIT_WORK_INJURY_CARDINAL,
+			s.UNIT_BIRTH_CARDINAL
 		from t_dispatch_info a
 		left join t_social_info s on s.id=a.SOCIAL_ID
+		left join t_provident_fund c on c.id=a.FUND_ID
         <where>
             a.DELETE_FLAG = '0'
             <include refid="tDispatchInfo_where"/>