Commit 0a7e35b9 authored by huyuchen's avatar huyuchen

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

parents 2cfeb7ad cfdb5b70
...@@ -137,13 +137,17 @@ public class TEmployeeContractPreController { ...@@ -137,13 +137,17 @@ public class TEmployeeContractPreController {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
//如果是电子签发起线下签先更新为线下签 //如果是电子签发起线下签先更新为线下签
if(null != signType && null != idList) { if(null != signType && null != idList) {
TEmployeeContractPre tEmployeeContractPre;
// 2025-11-3 14:54:57 测试(龙弟)说发起线下签署,如果是电子签,将撤销原因,是否撤销还原到初始的
for (String id : idList) { for (String id : idList) {
TEmployeeContractPre tEmployeeContractPre = tEmployeeContractPreService.getById(id); tEmployeeContractPre = tEmployeeContractPreService.getById(id);
if (tEmployeeContractPre != null && "0".equals(tEmployeeContractPre.getSignType())) { if (tEmployeeContractPre != null && "0".equals(tEmployeeContractPre.getSignType())) {
tEmployeeContractPre.setSignType("1"); tEmployeeContractPre.setSignType("1");
tEmployeeContractPre.setChangeTypeReason("手动派单转为线下签"); tEmployeeContractPre.setChangeTypeReason("手动派单转为线下签");
tEmployeeContractPre.setChangeTypeUser(user.getNickname()); tEmployeeContractPre.setChangeTypeUser(user.getNickname());
tEmployeeContractPre.setChangeTypeTime(DateUtil.getCurrentDateTime()); tEmployeeContractPre.setChangeTypeTime(DateUtil.getCurrentDateTime());
tEmployeeContractPre.setSignFlag(CommonConstants.ONE_STRING);
tEmployeeContractPre.setRevokeReason("");
tEmployeeContractPreService.updateById(tEmployeeContractPre); tEmployeeContractPreService.updateById(tEmployeeContractPre);
} }
} }
......
...@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setContractId(tEmployeeContractInfo.getId()); contractPre.setContractId(tEmployeeContractInfo.getId());
contractPre.setErrorInfo(""); contractPre.setErrorInfo("");
contractPre.setErrorTime(null); contractPre.setErrorTime(null);
contractPre.setSignFlag(CommonConstants.ONE_STRING);
contractPre.setRevokeReason("");
contractPreMapper.updateById(contractPre); contractPreMapper.updateById(contractPre);
} }
} }
......
...@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.NINE_STRING) .ne(TEmployeeContractPre::getProcessStatus, CommonConstants.NINE_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.FOUR_STRING) .ne(TEmployeeContractPre::getProcessStatus, CommonConstants.FOUR_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING) .ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.ELEVEN_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.EIGHT_STRING)); .ne(TEmployeeContractPre::getProcessStatus, CommonConstants.EIGHT_STRING));
if (Common.isEmpty(contractPreList)) { if (Common.isEmpty(contractPreList)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
......
...@@ -253,6 +253,9 @@ public class FascUtil { ...@@ -253,6 +253,9 @@ public class FascUtil {
pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING); pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING);
tFascPushLogService.updateById(pushLog); tFascPushLogService.updateById(pushLog);
// 参与方控件,要排除掉
// key是docID+控件ID
Map<String, Integer> fillMap = new HashMap<>();
if (res.isSuccess() && res.getData() != null && res.getData().getActors() != null if (res.isSuccess() && res.getData() != null && res.getData().getActors() != null
&& !res.getData().getActors().isEmpty()) { && !res.getData().getActors().isEmpty()) {
String companyActorId = null; String companyActorId = null;
...@@ -270,6 +273,11 @@ public class FascUtil { ...@@ -270,6 +273,11 @@ public class FascUtil {
&& Common.isNotNull(actor.getActorInfo().getActorId())) { && Common.isNotNull(actor.getActorInfo().getActorId())) {
personActorId = actor.getActorInfo().getActorId(); personActorId = actor.getActorInfo().getActorId();
} }
if (actor.getFillFields() != null && !actor.getFillFields().isEmpty()) {
for (FillActorFieldInfo a :actor.getFillFields()) {
fillMap.put(a.getFieldDocId() + CommonConstants.DOWN_LINE_STRING + a.getFieldId(), CommonConstants.ONE_INT);
}
}
} }
template.setCompanyActorId(companyActorId); template.setCompanyActorId(companyActorId);
template.setPersonActorId(personActorId); template.setPersonActorId(personActorId);
...@@ -288,19 +296,21 @@ public class FascUtil { ...@@ -288,19 +296,21 @@ public class FascUtil {
fieldType = fields.getFieldType(); fieldType = fields.getFieldType();
if (Common.isNotNull(fieldType)) { if (Common.isNotNull(fieldType)) {
if (FascConstants.FIELD_TEXT_TYPE.contains(fieldType)) { if (FascConstants.FIELD_TEXT_TYPE.contains(fieldType)) {
// 文本数字等控件 if (fillMap.get(docId + CommonConstants.DOWN_LINE_STRING + fields.getFieldId()) == null) {
detail = new TFascTemplateDetail(); // 文本数字等控件
detail.setSignTemplateId(signTemplateId); detail = new TFascTemplateDetail();
detail.setFascDocId(docId); detail.setSignTemplateId(signTemplateId);
detail.setFascField(fields.getFieldName()); detail.setFascDocId(docId);
detail.setFascFieldId(fields.getFieldId()); detail.setFascField(fields.getFieldName());
isMust = CommonConstants.ONE_STRING; detail.setFascFieldId(fields.getFieldId());
if (this.isFieldNotRequired(fields, fieldType)) { isMust = CommonConstants.ONE_STRING;
isMust = CommonConstants.ZERO_STRING; if (this.isFieldNotRequired(fields, fieldType)) {
isMust = CommonConstants.ZERO_STRING;
}
detail.setIsMust(isMust);
detail.setDeleteFlag(CommonConstants.NOT_DELETE_FLAG);
detailList.add(detail);
} }
detail.setIsMust(isMust);
detail.setDeleteFlag(CommonConstants.NOT_DELETE_FLAG);
detailList.add(detail);
} else if (FascConstants.FIELD_ZHANG_TYPE.contains(fieldType)) { } else if (FascConstants.FIELD_ZHANG_TYPE.contains(fieldType)) {
// 章控件 // 章控件
if (zhangName.length() > 0) { if (zhangName.length() > 0) {
......
...@@ -21,6 +21,17 @@ ...@@ -21,6 +21,17 @@
<dependency> <dependency>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-core</artifactId> <artifactId>yifu-common-core</artifactId>
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</exclusion>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId>
</exclusion>
<!-- 排除所有可能的 hutool 模块 -->
</exclusions>
</dependency> </dependency>
<!--swagger 注解--> <!--swagger 注解-->
<dependency> <dependency>
...@@ -90,11 +101,15 @@ ...@@ -90,11 +101,15 @@
<version>1.2.0</version> <version>1.2.0</version>
</dependency> </dependency>
<!-- 交行jar引入 --> <!-- 交行jar引入 -->
<dependency> <!--<dependency>
<groupId>com.ipct.safety</groupId> <groupId>com.ipct.safety</groupId>
<artifactId>ipct_safety</artifactId> <artifactId>ipct_safety</artifactId>
<version>2.1.0</version> <version>2.1.1</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.8</version>
</dependency>-->
</dependencies> </dependencies>
</project> </project>
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