|
@@ -8,9 +8,9 @@ import com.zjugis.business.converter.common.SelectConvert;
|
|
|
|
|
|
import com.zjugis.business.converter.officialSeal.OfficialSealConvert;
|
|
|
|
|
|
-import com.zjugis.business.flow.officialSeal.dao.OfficialSealDao;
|
|
|
-import com.zjugis.business.flow.officialSeal.entity.OfficialSealDO;
|
|
|
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealVO;
|
|
|
+import com.zjugis.business.flow.officialSeal.dao.OfficialSealUseDao;
|
|
|
+import com.zjugis.business.flow.officialSeal.entity.OfficialSealUseDO;
|
|
|
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;
|
|
|
import com.zjugis.framework.common.pojo.CommonResult;
|
|
|
import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
import com.zjugis.framework.workflow.model.IFlowInstance;
|
|
@@ -34,32 +34,32 @@ import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.ex
|
|
|
* @Date:2024-02-27
|
|
|
*/
|
|
|
@Service
|
|
|
-public class OfficialSealServiceImpl implements OfficialSealService{
|
|
|
+public class OfficialSealUseServiceImpl implements OfficialSealUseService {
|
|
|
@Resource
|
|
|
private WorkflowClient workflowClient;
|
|
|
@Resource
|
|
|
- private OfficialSealDao officialSealDao;
|
|
|
+ private OfficialSealUseDao officialSealUseDao;
|
|
|
|
|
|
@Resource
|
|
|
private DictDataApi dictDataApi;
|
|
|
|
|
|
@Override
|
|
|
- public String createOfficialSeal(OfficialSealVO createReqVO) {
|
|
|
+ public String createOfficialSeal(OfficialSealUseVO createReqVO) {
|
|
|
// 插入
|
|
|
- OfficialSealDO officialSeal = OfficialSealConvert.INSTANCE.convert(createReqVO);
|
|
|
- officialSealDao.insert(officialSeal);
|
|
|
+ OfficialSealUseDO officialSeal = OfficialSealConvert.INSTANCE.convert(createReqVO);
|
|
|
+ officialSealUseDao.insert(officialSeal);
|
|
|
|
|
|
// 返回
|
|
|
return officialSeal.getId();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void updateOfficialSeal(OfficialSealVO updateReqVO) {
|
|
|
+ public void updateOfficialSeal(OfficialSealUseVO updateReqVO) {
|
|
|
// 校验存在
|
|
|
validateOfficialSealExists(updateReqVO.getId());
|
|
|
// 更新
|
|
|
- OfficialSealDO updateObj = (OfficialSealConvert.INSTANCE.convert(updateReqVO));
|
|
|
- officialSealDao.updateById(updateObj);
|
|
|
+ OfficialSealUseDO updateObj = (OfficialSealConvert.INSTANCE.convert(updateReqVO));
|
|
|
+ officialSealUseDao.updateById(updateObj);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -67,12 +67,12 @@ public class OfficialSealServiceImpl implements OfficialSealService{
|
|
|
// 校验存在
|
|
|
validateOfficialSealExists(id);
|
|
|
//删除
|
|
|
- officialSealDao.deleteById(id);
|
|
|
+ officialSealUseDao.deleteById(id);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OfficialSealDO findByInstanceId(String flowInstanceId) {
|
|
|
- return officialSealDao.findByInstanceId(flowInstanceId);
|
|
|
+ public OfficialSealUseDO findByInstanceId(String flowInstanceId) {
|
|
|
+ return officialSealUseDao.findByInstanceId(flowInstanceId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -83,12 +83,12 @@ public class OfficialSealServiceImpl implements OfficialSealService{
|
|
|
CommonResult<IFlowInstance> flowResult = workflowClient.flowInstance(flowInstanceId);
|
|
|
if (flowResult.isSuccess()) {
|
|
|
IFlowInstance flowInstance = flowResult.getData();
|
|
|
- OfficialSealDO entity = findByInstanceId(flowInstanceId);
|
|
|
+ OfficialSealUseDO entity = findByInstanceId(flowInstanceId);
|
|
|
if (Objects.isNull(entity)) {
|
|
|
- entity = new OfficialSealDO();
|
|
|
+ entity = new OfficialSealUseDO();
|
|
|
entity.setInstanceId(flowInstanceId);
|
|
|
entity.setUserId(userId);
|
|
|
- entity.setOfficialSealNo(flowInstance.getCode());
|
|
|
+ entity.setOfficialSealApplyNo(flowInstance.getCode());
|
|
|
entity.setCreateTime(LocalDateTime.now());
|
|
|
entity.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
|
|
|
// CommonResult<AdminUserRespDTO> result = adminUserApi.getUser(userId);
|
|
@@ -97,7 +97,7 @@ public class OfficialSealServiceImpl implements OfficialSealService{
|
|
|
// entity.setDeptId(result.getData().getDeptId());
|
|
|
// entity.setDeptName(result.getData().getDeptName());
|
|
|
// }
|
|
|
- officialSealDao.insert(entity);
|
|
|
+ officialSealUseDao.insert(entity);
|
|
|
}
|
|
|
return createMap(flowInstanceId, entity, userId);
|
|
|
}
|
|
@@ -107,29 +107,21 @@ public class OfficialSealServiceImpl implements OfficialSealService{
|
|
|
private Map<String, Object> createModelMap() {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("formEntity", new HashMap<>());
|
|
|
- List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_TYPE).getCheckedData());
|
|
|
- map.put("sealTypeJSON", JSON.toJSONString(sealTypeList));
|
|
|
- List<Select> sealWayList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_WAY).getCheckedData());
|
|
|
- map.put("sealWayJSON", JSON.toJSONString(sealWayList));
|
|
|
- List<Select> sealNameList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_NAME).getCheckedData());
|
|
|
- map.put("sealNameJSON", JSON.toJSONString(sealNameList));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> createMap(String flowInstanceId, OfficialSealDO entity, String userId) {
|
|
|
+ private Map<String, Object> createMap(String flowInstanceId, OfficialSealUseDO entity, String userId) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("formEntity", entity);
|
|
|
List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_TYPE).getCheckedData());
|
|
|
- map.put("sealTypeJSON", JSON.toJSONString(sealTypeList));
|
|
|
- List<Select> sealWayList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_WAY).getCheckedData());
|
|
|
- map.put("sealWayJSON", JSON.toJSONString(sealWayList));
|
|
|
+ map.put("sealTypeList", JSON.toJSONString(sealTypeList));
|
|
|
List<Select> sealNameList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_NAME).getCheckedData());
|
|
|
- map.put("sealNameJSON", JSON.toJSONString(sealNameList));
|
|
|
+ map.put("sealNameList", JSON.toJSONString(sealNameList));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
private void validateOfficialSealExists(String id) {
|
|
|
- if (officialSealDao.selectById(id) == null) {
|
|
|
+ if (officialSealUseDao.selectById(id) == null) {
|
|
|
throw exception(SEAL_NOT_EXISTS);
|
|
|
}
|
|
|
}
|