Merge branch 'develop'

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java

@@ -255,7 +255,7 @@ public class EkpSalaryParam implements Serializable {
 	 **/
 	private String fd_3af9d49d165e90;
 	/**
-	 * 税务主体
+	 * 税务主体-封面抬头
 	 **/
 	private String fd_3afab1895feea2;
 	/**
@@ -275,5 +275,9 @@ public class EkpSalaryParam implements Serializable {
 	 * 薪酬申请编号
 	 **/
 	private String fd_3b3bef19b61c38;
+	/**
+	 * 发放方式：银行、现金
+	 **/
+	private String fd_3bbbfdd1fc2950;
 
 }

yifu-common/yifu-common-ekp/src/main/resources/ekpFundConfig.properties

-ekpfund.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
+ekpfund.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 ekpfund.fdModelId=181d741547a691aa68b16149a40de901
 ekpfund.fdFlowId=18290af372be55308327273487abf72a
 ekpfund.docStatus=20

yifu-common/yifu-common-ekp/src/main/resources/ekpSocialConfig.properties

-ekpsocial.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
+ekpsocial.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
+#ekpsocial.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
 ekpsocial.fdModelId=181d741547a69ba9dbc12377948e98fd
 ekpsocial.fdFlowId=18233028fe91511376b00f74b3a8f3a7
 ekpsocial.docStatus=20

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrder.java

@@ -107,4 +107,10 @@ public class TOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+	/**
+	 * 星级
+	 */
+	@Schema(description = "星级")
+	private String level;
+
 }
\ No newline at end of file

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java

@@ -78,4 +78,10 @@ public class OrderAddVO implements Serializable {
 	 */
 	@Schema(description = "附件")
 	private MultipartFile[] file;
+
+	/**
+	 * 星级
+	 */
+	@Schema(description = "星级")
+	private String level;
 }

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListParam.java

@@ -68,4 +68,10 @@ public class OrderListParam extends BaseEntity {
 	@Schema(description = "订单id集合")
 	private List<String> idList;
 
+	/**
+	 * 星级
+	 */
+	@Schema(description = "星级")
+	private String level;
+
 }

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListVO.java

@@ -65,4 +65,10 @@ public class OrderListVO implements Serializable{
 	 */
 	@Schema(description = "订单状态 0待办理 1办理中 2已办结")
 	private Integer orderStatus;
+
+	/**
+	 * 星级
+	 */
+	@Schema(description = "星级")
+	private String level;
 }

yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml

@@ -16,12 +16,13 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateName" column="UPDATE_NAME" jdbcType="VARCHAR"/>
+			<result property="level" column="LEVEL" 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,ORDER_NO,CUSTOMER_NAME,
+        ID,ORDER_NO,CUSTOMER_NAME,LEVEL,
         DEPT_NAME,DEPT_NO,ORDER_STATUS,
         ORDER_CONTENT,CREATE_NAME,CREATE_TIME,
         UPDATE_BY,UPDATE_NAME,UPDATE_TIME,
@@ -36,6 +37,7 @@
 		a.CUSTOMER_NAME as customerName,
 		a.DEPT_NAME as deptName,
 		a.DEPT_NO as deptNo,
+		a.LEVEL as level,
 		a.ORDER_STATUS as orderStatus
 		from t_order a
 		left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
@@ -61,6 +63,9 @@
 		<if test="param.orderStatus != null">
 			and a.ORDER_STATUS = #{param.orderStatus}
 		</if>
+		<if test="param.level != null and param.level.trim() != ''">
+			and a.LEVEL = #{param.level}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -76,6 +81,7 @@
 		t.CUSTOMER_NAME as customerName,
 		t.DEPT_NAME as deptName,
 		t.DEPT_NO as deptNo,
+		t.LEVEL as level,
 		t.ORDER_STATUS as orderStatus
 		from t_order t
 		where t.DELETE_FLAG = 0 and t.id in
@@ -93,6 +99,7 @@
 		a.CUSTOMER_NAME as customerName,
 		a.DEPT_NAME as deptName,
 		a.DEPT_NO as deptNo,
+		a.LEVEL as level,
 		a.ORDER_STATUS as orderStatus
 		from t_order a
 		left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
@@ -118,6 +125,9 @@
 		<if test="param.orderStatus != null">
 			and a.ORDER_STATUS = #{param.orderStatus}
 		</if>
+		<if test="param.level != null and param.level.trim() != ''">
+			and a.LEVEL = #{param.level}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -134,6 +144,7 @@
 			   t.ORDER_NO as orderNo,
 			   t.CUSTOMER_NAME as customerName,
 			   t.ORDER_STATUS as orderStatus,
+			   t.LEVEL as level,
 		       t.ORDER_CONTENT as orderContent
 		from t_order t
 		where t.ID = #{id}

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeEkpUpdateVo.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.salary.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 同步ekp薪酬信息
+ *
+ * @author huyc
+ * @date 2023-04-18 11:40:14
+ */
+@Data
+public class TSalaryEmployeeEkpUpdateVo implements Serializable {
+
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@Schema(description = "身份证号")
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+
+	/**
+	 * 开户行总行
+	 */
+	@Schema(description = "开户行总行")
+	private String bankName;
+	/**
+	 * 银行卡号
+	 */
+	@Schema(description = "银行卡号")
+	private String bankNo;
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java

@@ -30,9 +30,11 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryEmployeeService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmployeeImportVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeEkpUpdateVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -197,4 +199,16 @@ public class TSalaryEmployeeController {
 		return tSalaryEmployeeService.importEmployee(vo);
 	}
 
+	/**
+	 * 同步ekp薪酬信息
+	 * @author huyc
+	 * @param vo
+	 * @return {@link R}
+	 */
+	@Schema(description = "同步ekp薪酬人员信息")
+	@PostMapping(value = "/updateEmployeeFromEkp")
+	public R updateEmployeeFromEkp(TSalaryEmployeeEkpUpdateVo vo) {
+		return tSalaryEmployeeService.updateEmployeeFromEkp(vo);
+	}
+
 }

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

@@ -24,6 +24,7 @@ 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.salary.entity.TSalaryEmployee;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmployeeImportVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeEkpUpdateVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeSearchVo;
 
@@ -112,4 +113,12 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
 
 	boolean checkBankInfoList(List<TSalaryEmployee> empList, List<ErrorMessage> errorList);
 
+	/**
+	 * @param vo
+	 * @Description: 同步ekp薪酬人员信息
+	 * @Author: huyc
+	 * @Date: 2023/04/18 11:38
+	 * @return {@link R}
+	 **/
+	R updateEmployeeFromEkp(TSalaryEmployeeEkpUpdateVo vo);
 }

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

@@ -53,6 +53,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -885,4 +886,28 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		}
 	}
 
+	/**
+	 * 同步ekp薪酬人员信息
+	 *
+	 * @author huyc
+	 * @param vo
+	 * @return {@link R}
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateEmployeeFromEkp(TSalaryEmployeeEkpUpdateVo vo) {
+		if (Common.isEmpty(vo.getEmpIdcard())) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		TSalaryEmployee one = baseMapper.selectOne(Wrappers.<TSalaryEmployee>query().lambda()
+				.eq(TSalaryEmployee::getEmpIdcard, vo.getEmpIdcard())
+				.last(CommonConstants.LAST_ONE_SQL));
+		if (Common.isNotNull(one)) {
+			one.setBankNo(vo.getBankNo());
+			one.setEmpName(vo.getEmpName());
+			one.setBankName(vo.getBankName());
+			baseMapper.updateById(one);
+		}
+		return R.ok();
+	}
 }

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

@@ -208,6 +208,7 @@
 		<result property="fundSum" column="fund_sum"/>
 		<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
 		<result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/>
+		<result property="fd_3bbbfdd1fc2950" column="fd_3bbbfdd1fc2950"/>
 	</resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -680,6 +681,7 @@
 			 ,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
 			,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
 			,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38
+			,if(a.SALARY_STYLE='0','现金','银行') fd_3bbbfdd1fc2950
 		from t_salary_account a
 			 LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
 			 left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'