Merge branch 'MVP1.6.8' into MVP1.6.9

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml

@@ -179,9 +179,9 @@
 		if(sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) > 0,1,0) as IS_COMPLETE,
 		sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) as INCOMPLETE_NUM,
 		concat(ROUND((sum(if(PROJECT_STATUS = 0,1,0)) - sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)))*100/sum(if(PROJECT_STATUS = 0,1,0)),2),'%') as COMPLETE_PER,
-		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01',1,0)) as AFTER_EMPLOYMENT,
-		if(sum(if((PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and IS_COMPLETE = '0') or '2024-05-01' > DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') or PROJECT_STATUS = 1,0,1)) > 0,1,0) AFTER_IS_COMPLETE,
-		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-09-01',1,0)) as AFTER_EMPLOYMENT,
+		if(sum(if((PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-09-01' and IS_COMPLETE = '0') or '2024-09-01' > DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') or PROJECT_STATUS = 1,0,1)) > 0,1,0) AFTER_IS_COMPLETE,
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-09-01' and IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM
 		from t_employee_project where DELETE_FLAG = '0' and PROJECT_STATUS = 0 group by DEPT_NO) a on a.DEPT_NO = b.DEPART_NO
 		where b.DELETE_FLAG = '0'
 		<if test="deptNo != null and deptNo.trim() != ''">

yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EKPEntryPushParam.java

+package com.yifu.cloud.plus.v1.ekp.vo;
+
+import lombok.Data;
+
+/**
+ * @author huych
+ * @description 入账明细推送
+ * @date 2024-08-23 16:31:15
+ */
+@Data
+public class EKPEntryPushParam {
+
+	/**
+	 * 来款单位
+	 */
+	private String fd_3aa453180cc7f0;
+
+	/**
+	 * 来款银行账号
+	 */
+	private String fd_3aa4531865bada;
+
+	/**
+	 * 是否银企直连读取
+	 */
+	private String fd_3b57f8de9df354;
+
+	/**
+	 * 来款单位开户行名
+	 */
+	private String fd_3b88c420e5ca80;
+
+	/**
+	 * 入账日期
+	 */
+	private String fd_3aa4531d3b86e0;
+
+	/**
+	 * 到款单位
+	 */
+	private String fd_3aa45319a4cde4;
+
+	/**
+	 * 到款银行账号
+	 */
+	private String fd_3b62f3470beb30;
+
+	/**
+	 * 财务备注
+	 */
+	private String fd_3b1b88110cb39e;
+
+	/**
+	 * 入账金额
+	 */
+	private String fd_3b208d364c2b70;
+
+	/**
+	 * 	入账日期(精确)
+	 */
+	private String fd_3cddecabdd3dc0;
+
+	/**
+	 * 	数据同步时间
+	 */
+	private String fd_3aa4531c687958;
+
+	/**
+	 * 	系统交易流水号
+	 */
+	private String fd_3b573843db30ce;
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowIssueController.java

-//package com.yifu.cloud.plus.v1.ekp.controller;
-//
-//import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowIssueService;
-//import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-//import io.swagger.v3.oas.annotations.Operation;
-//import io.swagger.v3.oas.annotations.tags.Tag;
-//import lombok.RequiredArgsConstructor;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-///**
-// * 聚富通代发工资相关
-// *
-// * @author huyc
-// * @date 2024-05-23 10:24:12
-// */
-//@RestController
-//@RequiredArgsConstructor
-//@RequestMapping("/icbcIssue" )
-//@Tag(name = "聚富通代发工资相关")
-//public class IcbcTransactionFlowIssueController {
-//
-//	private final IcbcTransactionFlowIssueService icbcTransactionFlowIssueService;
-//
-//	/**
-//	 * 聚富通代发工资确认提交
-//	 *
-//	 * @param
-//	 * @param
-//	 * @return
-//	 */
-//	@Operation(summary = "聚富通代发工资确认提交接口", description = "聚富通代发工资确认提交接口")
-//	@PostMapping("/submit")
-//	public R submitIcbcTransactionFlow() {
-//		return icbcTransactionFlowIssueService.submitIcbcTransactionFlow();
-//	}
-//
-//	/**
-//	 * 代发工资明细查询
-//	 *
-//	 * @param
-//	 * @param
-//	 * @return
-//	 */
-//	@Operation(summary = "代发工资明细查询", description = "代发工资明细查询")
-//	@PostMapping("/page")
-//	public R selectIcbcTransactionFlowInfo() {
-//		return icbcTransactionFlowIssueService.selectIcbcTransactionFlowInfo();
-//	}
-//}
+package com.yifu.cloud.plus.v1.ekp.controller;
+
+import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowIssueService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 聚富通代发工资相关
+ *
+ * @author huyc
+ * @date 2024-05-23 10:24:12
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/icbcIssue" )
+@Tag(name = "聚富通代发工资相关")
+public class IcbcTransactionFlowIssueController {
+
+	private final IcbcTransactionFlowIssueService icbcTransactionFlowIssueService;
+
+	/**
+	 * 聚富通代发工资确认提交
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "聚富通代发工资确认提交接口", description = "聚富通代发工资确认提交接口")
+	@PostMapping("/submit")
+	public R submitIcbcTransactionFlow() {
+		return icbcTransactionFlowIssueService.submitIcbcTransactionFlow();
+	}
+
+	/**
+	 * 代发工资明细查询
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "代发工资明细查询", description = "代发工资明细查询")
+	@PostMapping("/page")
+	public R selectIcbcTransactionFlowInfo() {
+		return icbcTransactionFlowIssueService.selectIcbcTransactionFlowInfo();
+	}
+
+	/**
+	 * 企业会员用户绑定管家卡
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "企业会员用户绑定管家卡", description = "企业会员用户绑定管家卡")
+	@PostMapping("/business")
+	public R businessOpen() {
+		return icbcTransactionFlowIssueService.businessOpen();
+	}
+
+	/**
+	 * 代发工资发放成功异步通知功能
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "代发工资发放成功异步通知功能", description = "代发工资发放成功异步通知功能")
+	@PostMapping("/notifyUrl")
+	public R asyncNotice(HttpServletRequest request) throws Exception {
+		return icbcTransactionFlowIssueService.asyncNotice(request);
+	}
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowQueryController.java

 package com.yifu.cloud.plus.v1.ekp.controller;
 
+import com.icbc.api.IcbcApiException;
 import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +36,18 @@ public class IcbcTransactionFlowQueryController {
 		return icbcTransactionFlowQueryService.getIcbcTransactionFlow();
 	}
 
+	/**
+	 * 交易流水查询
+	 *
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "交易流水查询", description = "交易流水查询")
+	@PostMapping("/newPage")
+	public R getIcbcTransactionFlowNew() throws IcbcApiException {
+		return icbcTransactionFlowQueryService.getIcbcTransactionFlowNew();
+	}
+
 	/**
 	 * 预订单接口
 	 *
@@ -46,4 +59,18 @@ public class IcbcTransactionFlowQueryController {
 	public R saveIcbcManagerCard() {
 		return icbcTransactionFlowQueryService.saveIcbcManagerCard();
 	}
+
+
+	/**
+	 * 行名行号查询接口
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@Operation(summary = "行名行号查询接口", description = "行名行号查询接口")
+	@PostMapping("/querybankinfo")
+	public R querybankinfo() {
+		return icbcTransactionFlowQueryService.querybankinfo();
+	}
 }

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpSocialInfoMapper.java

@@ -33,4 +33,11 @@ public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
 	EkpSocialSumInfoVo getCostSumInfo(@Param("card") String empIdCard, @Param("month") String createMonth);
 
 	void updateSocialStatus(@Param("sql") String sql);
+
+	/**
+	 * 获取所有当天的到账明细的交易流水号
+	 * @param
+	 * @return
+	 */
+	List<String> getAllserioNo();
 }

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowIssueService.java

-//package com.yifu.cloud.plus.v1.ekp.service;
-//
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
-//import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-//
-///**
-// * 聚富通代发工资相关
-// *
-// * @author huyc
-// * @date 2024-05-24 10:55:24
-// */
-//public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo> {
-//
-//	R submitIcbcTransactionFlow();
-//
-//	R selectIcbcTransactionFlowInfo();
-//
-//}
+package com.yifu.cloud.plus.v1.ekp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 聚富通代发工资相关
+ *
+ * @author huyc
+ * @date 2024-05-24 10:55:24
+ */
+public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo> {
+
+	R submitIcbcTransactionFlow();
+
+	R selectIcbcTransactionFlowInfo();
+
+	R businessOpen();
+
+	R asyncNotice(HttpServletRequest request) throws Exception;
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java

 package com.yifu.cloud.plus.v1.ekp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.icbc.api.IcbcApiException;
 import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 
@@ -14,6 +15,10 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
 
 	R getIcbcTransactionFlow();
 
+	R getIcbcTransactionFlowNew() throws IcbcApiException;
+
 	R saveIcbcManagerCard();
 
+	R querybankinfo();
+
 }

yifu-ekp/yifu-ekp-biz/src/main/resources/application.yml

@@ -70,3 +70,9 @@ springdoc:
     - group: ekp
       #按包路径匹配
       packagesToScan: com.yifu.cloud.plus.v1.ekp.controller
+
+#工行生产环境配置
+icbc:
+  appId: 11000000000000019038
+  appPrivateKey: 4d931f6ad4331158fcc4dea23f0d71393328146e40b5f63f197b9f6ad3732f44
+  serverUrl: https://gw.open.icbc.com.cn/api/mybank/enterprise/trade/qhisd/V1
\ No newline at end of file

yifu-ekp/yifu-ekp-biz/src/main/resources/file/API_GATEWAY_ICBC_SM_REAL.cer

+-----BEGIN CERTIFICATE-----
+MIIDdDCCAxegAwIBAgIFRjBiNDYwDAYIKoEcz1UBg3UFADBcMQswCQYDVQQGEwJD
+TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5MRswGQYDVQQDDBJDRkNBIEFDUyBTTTIgT0NBMzEwHhcNMjMwMjE1MDkyMTA5
+WhcNMjgwMjE1MDkyMTA5WjCBpTELMAkGA1UEBhMCQ04xGzAZBgNVBAoMEkNGQ0Eg
+QUNTIFNNMiBPQ0EzMTETMBEGA1UECwwKQ0ZDQSBPQ0EzMTEZMBcGA1UECwwQT3Jn
+YW5pemF0aW9uYWwtMTFJMEcGA1UEAwxAQ0ZDQUDkuK3lm73lt6XllYbpk7booYzo
+gqHku73mnInpmZDlhazlj7hATjkxMTAwMDAwMTAwMDAzOTYyVEAxNjBZMBMGByqG
+SM49AgEGCCqBHM9VAYItA0IABC7pDFU19+SE4Bog4M7om/nsDbTtXHBlfp5G2e1I
+ya4LmFW5ZqOxmmQBysFwl9nDq3svOHMZ53Mpe14Z1m/OYFajggF4MIIBdDBsBggr
+BgEFBQcBAQRgMF4wKAYIKwYBBQUHMAGGHGh0dHA6Ly9vY3NwLmNmY2EuY29tLmNu
+L29jc3AwMgYIKwYBBQUHMAKGJmh0dHA6Ly9jcmwuY2ZjYS5jb20uY24vb2NhMzEv
+b2NhMzEuY2VyMB8GA1UdIwQYMBaAFAjY0SbESH2c7KyY6fF/YrmAzqlFMAwGA1Ud
+EwEB/wQCMAAwSAYDVR0gBEEwPzA9BghggRyG7yoBBDAxMC8GCCsGAQUFBwIBFiNo
+dHRwOi8vd3d3LmNmY2EuY29tLmNuL3VzL3VzLTE0Lmh0bTA9BgNVHR8ENjA0MDKg
+MKAuhixodHRwOi8vY3JsLmNmY2EuY29tLmNuL29jYTMxL1NNMi9jcmwyNzMwLmNy
+bDAOBgNVHQ8BAf8EBAMCBsAwHQYDVR0OBBYEFOpEqrs73yvBXqvDQoT33v05FnDI
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAMBggqgRzPVQGDdQUAA0kA
+MEYCIQCdKpfhUijpAKEQekHxlk4LvnqzzaYmODo3T3qmZUJsUwIhAOaMMH0Ipwef
+VTSwJlhrVbmEB5DmoxLo1Xb/1tvfW1l2
+-----END CERTIFICATE-----
\ No newline at end of file

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSocialInfoMapper.xml

@@ -116,4 +116,14 @@
 	<update id="updateSocialStatus">
 		#{sql}
 	</update>
+
+	<!--查询社保明细信息-->
+	<select id="getAllserioNo" resultType="java.lang.String">
+		SELECT
+			fd_3b573843db30ce
+		from ekp_79c234bf64d412294f23
+		where fd_3b62f3470beb30 = '1302010109024596014'
+		and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d')
+		and fd_3b57f8de9df354 = '是'
+	</select>
 </mapper>