Commit 6315c89b authored by huyuchen's avatar huyuchen

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

parents 58e5629f 3b28938c
...@@ -32,7 +32,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin ...@@ -32,7 +32,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
private static final String SPRING_SECURITY_RESTFUL_LOGIN_URL = "/oauth/wxLogin"; private static final String SPRING_SECURITY_RESTFUL_LOGIN_URL = "/oauth/wxLogin";
private boolean postOnly = false; private boolean postOnly = true;
private RestTemplate restTemplate = new RestTemplate(); private RestTemplate restTemplate = new RestTemplate();
......
...@@ -147,8 +147,9 @@ public interface SecurityConstants { ...@@ -147,8 +147,9 @@ public interface SecurityConstants {
* @Description: 企业微信发送消息授权路径 * @Description: 企业微信发送消息授权路径
* @return: * @return:
* 下面链接中的state参数是和前端进行交互区分的重要参数,如果新增,请不要和以前的前缀相同 * 下面链接中的state参数是和前端进行交互区分的重要参数,如果新增,请不要和以前的前缀相同
* 1,2,3,4 前缀为合同审批待处理、抄送和垫付审批中的待处理、抄送。 5 前缀为突发事件待处理页面的标识 * 第一位标识消息类型:0审批,1抄送
* 1=垫付审批待处理,2=垫付审批抄送,3=合同审批待处理,4=合同审批抄送,5=事件审批待处理 * 第二位标识实体标识:1不购买商险申请
* 01 : 不购买商险申请审批
**/ **/
String WX_GET_MESSAGE_AUTH_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect"; String WX_GET_MESSAGE_AUTH_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect";
......
...@@ -29,6 +29,7 @@ public class ProcessDaprUtils { ...@@ -29,6 +29,7 @@ public class ProcessDaprUtils {
* @since mvp1.7.5 * @since mvp1.7.5
**/ **/
public R<ProcessVo> getProcessVoByType(String processType) { public R<ProcessVo> getProcessVoByType(String processType) {
log.error("流程类型>>processType>>{}",processType);
R<ProcessVo> processVoR = HttpDaprUtil.invokeMethodPost(daprProcessProperties.getAppUrl(),daprProcessProperties.getAppId(),"/tprocess/inner/getProcessVoByType", processType, ProcessVo.class, SecurityConstants.FROM_IN); R<ProcessVo> processVoR = HttpDaprUtil.invokeMethodPost(daprProcessProperties.getAppUrl(),daprProcessProperties.getAppId(),"/tprocess/inner/getProcessVoByType", processType, ProcessVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(processVoR)){ if (Common.isEmpty(processVoR)){
return R.failed("根据流程类型查询ProcessVo失败!"); return R.failed("根据流程类型查询ProcessVo失败!");
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -68,6 +69,7 @@ public class TNodeRoute extends Model<TNodeRoute> { ...@@ -68,6 +69,7 @@ public class TNodeRoute extends Model<TNodeRoute> {
private String createUser; private String createUser;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate; private LocalDateTime createDate;
@Length(max = 255, message = "更新人不能超过255个字符") @Length(max = 255, message = "更新人不能超过255个字符")
......
...@@ -17,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; ...@@ -17,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -33,6 +34,7 @@ import java.time.LocalDateTime; ...@@ -33,6 +34,7 @@ import java.time.LocalDateTime;
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/tprocess") @RequestMapping("/tprocess")
@Tag(name = "主流程表") @Tag(name = "主流程表")
@Log4j2
public class TProcessController { public class TProcessController {
@Resource @Resource
...@@ -96,7 +98,7 @@ public class TProcessController { ...@@ -96,7 +98,7 @@ public class TProcessController {
**/ **/
@PostMapping("/inner/getProcessVoByType") @PostMapping("/inner/getProcessVoByType")
@Inner @Inner
public ProcessVo getProcessVoByType(String processType) { public ProcessVo getProcessVoByType(@RequestBody String processType) {
return tProcessService.getProcessVoByType(processType); return tProcessService.getProcessVoByType(processType);
} }
...@@ -108,7 +110,7 @@ public class TProcessController { ...@@ -108,7 +110,7 @@ public class TProcessController {
**/ **/
@PostMapping("/inner/getProcessVoByProcessId") @PostMapping("/inner/getProcessVoByProcessId")
@Inner @Inner
public ProcessVo getProcessVoByProcessId(String processId) { public ProcessVo getProcessVoByProcessId(@RequestBody String processId) {
return tProcessService.getProcessVoById(processId); return tProcessService.getProcessVoById(processId);
} }
......
...@@ -45,9 +45,6 @@ public class TAuditNodeProcess extends BaseEntity { ...@@ -45,9 +45,6 @@ public class TAuditNodeProcess extends BaseEntity {
@Schema(description = "节点类型") @Schema(description = "节点类型")
private String nodeType; private String nodeType;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Length(max = 32, message = "实体id不能超过32个字符") @Length(max = 32, message = "实体id不能超过32个字符")
@Schema(description = "实体id") @Schema(description = "实体id")
private String domainId; private String domainId;
......
...@@ -1180,27 +1180,37 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1180,27 +1180,37 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if (!updatePerSonSalaryList.isEmpty()) { if (!updatePerSonSalaryList.isEmpty()) {
tInsuranceUnpurchasePersonSalaryService.saveBatch(updatePerSonSalaryList); tInsuranceUnpurchasePersonSalaryService.saveBatch(updatePerSonSalaryList);
} }
s.setIsCheckRisk(CommonConstants.ONE_INT); return getTrueR(s, "校验通过");
this.updateById(s);
return R.ok();
} else { } else {
return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList); return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList);
} }
} else { } else {
return R.ok(null, "均已购买商险"); return getTrueR(s, "均已购买商险");
} }
} }
} else { } else {
return R.ok(null, "没有报账明细,无需拦截"); return getTrueR(s, "没有报账明细,无需拦截");
} }
} else { } else {
return R.ok(null, "项目不含风险 或 无商险"); return getTrueR(s, "项目不含风险 或 无商险");
} }
} else { } else {
return R.failed("获取项目信息失败,请联管理员!"); return R.failed("获取项目信息失败,请联管理员!");
} }
} }
/**
* @Description: 校验通过的返回
* @Author: hgw
* @Date: 2025/1/16 11:16
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>>
**/
private R<List<SalaryRiskVo>> getTrueR(TSalaryStandard s, String msg) {
s.setIsCheckRisk(CommonConstants.ONE_INT);
this.updateById(s);
return R.ok(null, msg);
}
/** /**
* @Description: 设置增加 不购买商险的相关信息 * @Description: 设置增加 不购买商险的相关信息
* @Author: hgw * @Author: hgw
......
...@@ -210,7 +210,7 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess ...@@ -210,7 +210,7 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
Map<String, Object> textcard = new HashMap<>(); Map<String, Object> textcard = new HashMap<>();
authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getAuthUrl(), CommonConstants.SIX_STRING + insuranceUnpurchaseApply.getId()); authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getAuthUrl(), "01"+insuranceUnpurchaseApply.getId());
textcard.put("title", "含风险项目不购买商险申请"); textcard.put("title", "含风险项目不购买商险申请");
textcard.put("url", authUrl); textcard.put("url", authUrl);
...@@ -228,7 +228,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess ...@@ -228,7 +228,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
reasonTypeMap.put("1", "已购买社保"); reasonTypeMap.put("1", "已购买社保");
reasonTypeMap.put("2", "人员已离职"); reasonTypeMap.put("2", "人员已离职");
description.append("不购买原因:").append(reasonTypeMap.get(insuranceUnpurchaseApply.getReasonType())).append("<br>"); description.append("不购买原因:").append(reasonTypeMap.get(insuranceUnpurchaseApply.getReasonType())).append("<br>");
description.append("不购买人数:").append(insuranceUnpurchaseApply.getUnbuyNum()).append("<br>");
String unbuyNum = CommonConstants.ZERO_STRING;
if(Common.isNotNull(insuranceUnpurchaseApply.getUnbuyNum())){
unbuyNum = insuranceUnpurchaseApply.getUnbuyNum();
}
description.append("不购买人数:").append(unbuyNum).append("<br>");
textcard.put("description", description.toString()); textcard.put("description", description.toString());
requestMap.put("touser", sendUser); requestMap.put("touser", sendUser);
......
...@@ -15,8 +15,10 @@ spring: ...@@ -15,8 +15,10 @@ spring:
username: root username: root
password: yf_zsk password: yf_zsk
url: jdbc:mysql://192.168.1.65:43306/mvp_salary?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.1.65:43306/mvp_salary?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
wx:
corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010
authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
...@@ -31,4 +31,4 @@ wx: ...@@ -31,4 +31,4 @@ wx:
corpid: wwbcb090af0dfe50e5 corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010 agentid: 1000010
authUrl: https://test-worfu.com/yifu-auth/method/oauth/wxLogin authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment