Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5

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

@@ -105,7 +105,7 @@ public class MSetttleCustomerUserController {
      */
     @Inner
     @PostMapping("/inner/getCustomerUserMap")
-    public Map<String,String> getCustomerUserMap(@RequestBody List<Integer> userIdList) {
+    public Map<String,String> getCustomerUserMap(@RequestBody List<String> userIdList) {
         return mSetttleCustomerUserService.getCustomerUser(userIdList);
     }
     /**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/MSetttleCustomerUserMapper.java

@@ -27,7 +27,7 @@ public interface MSetttleCustomerUserMapper extends BaseMapper<MSetttleCustomerU
     IPage<MSetttleCustomerUser> getMSetttleCustomerUserPage(Page<MSetttleCustomerUser> page, @Param("mSetttleCustomerUser") MSetttleCustomerUser mSetttleCustomerUser);
 
 
-    List<MSetttleCustomerUserVo> getCustomerUser(@Param("userIdList")List<Integer> userIdList);
+    List<MSetttleCustomerUserVo> getCustomerUser(@Param("userIdList")List<String> userIdList);
 
     Integer getCustomerCount();
 

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

@@ -26,7 +26,7 @@ public interface MSetttleCustomerUserService extends IService<MSetttleCustomerUs
     IPage<MSetttleCustomerUser> getMSetttleCustomerUserPage(Page<MSetttleCustomerUser> page, MSetttleCustomerUser mSetttleCustomerUser);
 
 
-    Map<String,String> getCustomerUser(List<Integer> userIdList);
+    Map<String,String> getCustomerUser(List<String> userIdList);
 
     Integer getCustomerCount();
 

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

@@ -40,7 +40,7 @@ public class MSetttleCustomerUserServiceImpl extends ServiceImpl<MSetttleCustome
     }
 
     @Override
-    public Map<String, String> getCustomerUser(List<Integer> userIdList) {
+    public Map<String, String> getCustomerUser(List<String> userIdList) {
         Map<String,String> map = new HashMap<>();
         List<MSetttleCustomerUserVo> list = baseMapper.getCustomerUser(userIdList);
         if(Common.isNotNull(list)){

yifu-auth/src/main/resources/application-prd.yml

@@ -39,6 +39,6 @@ spring:
     template-loader-path: classpath:/templates/
 wx:
   corpid: wwbcb090af0dfe50e5
-  corpsecret: kFG3_g_Ce0bpZt6mByx524
+  corpsecret: R0nKkvsY-oF41fuQvUXZ-kFG3_g_Ce0bpZt6mByx524
   agentid: 1000009
-  authUrl: https://wx.worfu.com/auth/oauth/wxLogin
+  authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
\ No newline at end of file

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

@@ -102,6 +102,10 @@ public interface CacheConstants {
 	 **/
 	String EVERYDAY_SALARY_FORM_CODE = "everyday_salary_form_code";
 
+	String EVERYDAY_UNBUY_FORM_CODE = "everyday_unbuy_form_code";
+
+	String EVERYDAY_UNBUYINFO_FORM_CODE = "everyday_unbuyinfo_form_code";
+
 	/**
 	 * @Description:  派单申请编码
 	 * @Author: fxj
@@ -178,6 +182,8 @@ public interface CacheConstants {
 
 	String EMP_ADD_LOCK ="emp_add_lock";
 
+	String UNBUY_ADD_LOCK ="unbuy_add_lock";
+
 	String SALARY_ACCOUNT_EXPORT_LOCK ="salary_account_export_lock";
 
 	String SALARY_ACCOUNT_AUDIT_EXPORT_LOCK ="salary_account_audit_export_lock";

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

@@ -343,7 +343,7 @@ public interface CommonConstants {
 
 	String NO_DATA_TO_HANDLE = "无数据可操作！";
 
-	String DATA_TOO_LARGER_FOR_DOWN = "下载数据超出100M，请重现选择下载条件！";
+	String DATA_TOO_LARGER_FOR_DOWN = "下载数据超出100M，请重新选择下载条件！";
 
 	String PLEASE_LOG_IN = "请登录！";
 

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

@@ -22,6 +22,8 @@ public class ResultConstants {
     public static final String NO_GETLOCK_DATA = "当前用户操作处理中，请稍后重试！";
 	public static final String NO_GETLOCK_DATA_SEARCH = "多用户同时请求中，请稍后重试！";
 
+	public static final String NO_UNBUY_GETLOCK_DATA = "当前项目编码和不购买类型的数据处理中，请稍后重试！";
+
     public static final String NO_ID = "操作失败，id不能为空!";
 	public static final String FILE_UPLOADING_DATA = "附件排队上传中，请稍后重试！";
 	public static final String FILE_DOWN_LOAD_DATA = "导出排队下载中，请稍后重试！";

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/config/WxConfig.java

@@ -124,11 +124,11 @@ public class WxConfig {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
         Gson gson = new Gson();
-		log.info("发企业微信===请求：{}", gson.toJson(requestMap));
+		log.debug("发企业微信===请求：{}", gson.toJson(requestMap));
         HttpEntity<String> requestEntity = new HttpEntity<>(gson.toJson(requestMap), headers);
         String accessToken = getAccessToken(restTemplate);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(String.format(SecurityConstants.WX_SEND_MESSAGE, accessToken), requestEntity, String.class);
-		log.info("发企业微信===返回：{}",JSON.toJSONString(responseEntity));
+		log.error("发企业微信===返回：{}",JSON.toJSONString(responseEntity));
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(responseEntity));
         JSONObject jsonBody = jsonObject.getJSONObject("body");
         if (jsonBody != null) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TInsuranceUnpurchaseApplyMapper.java

@@ -45,6 +45,10 @@ public interface TInsuranceUnpurchaseApplyMapper extends BaseMapper<TInsuranceUn
 
 	String getMaxInusuranceDetailCode();
 
+	long selectSocialCount(@Param("deptNo") String deptNo,@Param("cardNo") String cardNo,@Param("id") String id);
+
+	long selectArchCount(@Param("deptNo") String deptNo,@Param("cardNo") String cardNo,@Param("id") String id);
+
 	/**
 	 * 待审核分页查询
 	 * @param page           分页信息

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/AbastractAuditProcess.java

@@ -210,7 +210,7 @@ public abstract class AbastractAuditProcess<T,E extends T> {
      * @return R<List<SysUser>>
      **/
     public R<List<SysUser>> getAuditUserList(String entityId, YifuUser loginUser, String departId, String processType, String auditType,
-												String reason, String entityName, T entity, Class<T> clazz) {
+												String reason, String entityName, T entity) {
         // 获取审批流程完整配置
         ProcessVo processVo = this.getProcessVoByType(processType);
         if (Common.isEmpty(processVo)) {

yifu-salary/yifu-salary-biz/src/main/resources/application-prd.yml

@@ -27,6 +27,10 @@ spring:
       auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
       max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
 
-
+wx:
+  corpid: wwbcb090af0dfe50e5
+  corpsecret: R0nKkvsY-oF41fuQvUXZ-kFG3_g_Ce0bpZt6mByx524
+  agentid: 1000009
+  authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
 
 

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml

@@ -118,6 +118,34 @@
 		</where>
 	</select>
 
+	<select id="selectSocialCount" resultType="java.lang.Long">
+		SELECT
+		count(1)
+		FROM t_insurance_unpurchase_apply a
+		inner join t_insurance_unpurchase_person b
+		on a.id = b.PARNET_ID
+		where
+			1=1 and a.DELETE_FLAG = '0' and a.reason_type = '1' and a.status in ('2','3')
+			<if test="id != null ">
+				AND a.id != #{id}
+			</if>
+			and a.DEPT_NO = #{deptNo} and b.EMP_IDCARD_NO = #{cardNo}
+	</select>
+
+	<select id="selectArchCount" resultType="java.lang.Long">
+		SELECT
+		count(1)
+		FROM t_insurance_unpurchase_apply a
+		inner join t_insurance_unpurchase_person b
+		on a.id = b.PARNET_ID
+		where
+		1=1 and a.DELETE_FLAG = '0' and a.reason_type = '2' and a.status in ('2','3') and b.SALARY_NUM = 0
+		<if test="id != null ">
+			AND a.id != #{id}
+		</if>
+		and a.DEPT_NO = #{deptNo} and b.EMP_IDCARD_NO = #{cardNo}
+	</select>
+
 	<!-- tInsuranceUnpurchaseApply简单分页查询 -->
 	<select id="getTInsuranceUnpurchaseApplyExportList" resultMap="tInsuranceUnpurchaseApplyExportMap">
 		SELECT
@@ -126,7 +154,7 @@
 		a.DEPT_NO,
 		a.CREATE_NAME,
 		a.CREATE_USER_DEPT_NAME,
-		a.CREATE_TIME,
+		a.CREATE_TIME_ZC as CREATE_TIME,
 		a.AUDIT_USER,
 		if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE,
 		CASE WHEN a.STATUS=0 THEN "草稿"

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml

@@ -130,7 +130,31 @@
     <!--tInsuranceUnpurchasePerson简单分页查询-->
     <select id="getTInsuranceUnpurchasePersonPage" resultMap="tInsuranceUnpurchasePersonMap">
         SELECT
-        <include refid="Base_Column_List"/>
+		a.ID,
+		a.PARNET_ID,
+		a.EMP_NAME,
+		a.EMP_IDCARD_NO,
+		a.POST,
+		a.APPLY_NO_DETAIL,
+		a.DEPT_ID,
+		a.DEPT_NO,
+		a.DEPT_NAME,
+		a.CREATE_USER_DEPT_ID,
+		a.CREATE_USER_DEPT_NAME,
+		a.REASON_TYPE,
+		a.REASON_INFO,
+		a.APPLY_NO,
+		if(a.REASON_TYPE = '2','',a.SOCIAL_STATUS) SOCIAL_STATUS,
+		a.SALARY_NUM,
+		a.CREATE_BY,
+		a.CREATE_NAME,
+		a.CREATE_TIME,
+		a.UPDATE_BY,
+		a.UPDATE_TIME,
+		a.HAS_CONTAIN_RISKS,
+		a.NEW_LINE,
+		a.DIVISION,
+		a.INSURANCE_FLAG
         FROM t_insurance_unpurchase_person a
         <where>
             1=1 and STATUS = '3'
@@ -162,7 +186,7 @@
 		EMP_NAME,
 		EMP_IDCARD_NO,
 		if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE,
-		if(a.SOCIAL_STATUS='0','在保','不在保') SOCIAL_STATUS,
+		if(a.REASON_TYPE = '2','',if(a.SOCIAL_STATUS='0','在保','不在保')) SOCIAL_STATUS,
 		SALARY_NUM,
 		CREATE_NAME,
 		CREATE_TIME

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java

@@ -454,7 +454,8 @@ public class UserController {
 	@Inner
 	@PostMapping(value = {"/inner/getSimpleUserByLoginName"})
 	public SysUser getSimpleUserByLoginName(@RequestBody String loginName) {
-		return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername,loginName).last(CommonConstants.LAST_ONE_SQL));
+		return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername,loginName)
+				.eq(SysUser::getDelFlag,CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
 	}
 
 	/**