ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 年度制修订标准化发起相关问题

Browse Source
This commit is contained in:
mzaxd
2023-12-14 09:18:39 +08:00
parent 49828e5aa1
commit f9ae2999e3
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
+13
View File
@@ -110,6 +110,19 @@ public class ESAnnualInitController {
}
/**
* 批量驳回
*
* @param ids
*/
@AutoLog(value = "企标年度制修订标准化发起流程-批量驳回")
@ApiOperation(value="企标年度制修订标准化发起流程-批量驳回", notes="企标年度制修订标准化发起流程-批量驳回")
@GetMapping("/batchReject")
public Result<?> reject(AnnualInitDataVO annualInitData, String ids) {
annualInitService.batchReject(annualInitData, ids);
return Result.OK();
}
/**
* 导入模板下载
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java
+2 -2
View File
@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -29,4 +27,6 @@ public interface ProcessEsAnnualInitService extends IService<ProcessEsAnnualInit
AnnualInitDataVO getHandleData(String taskId);
void approvalProcess(AnnualInitDataVO annualInitData, boolean b);
void batchReject(AnnualInitDataVO ids, String prcId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+7 -5
View File
@@ -2,14 +2,12 @@ package com.jero.modules.activiti.process.esAnnualInit.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.CommonAPI;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.SysDictItemCore;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessNode;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.CommonVO;
import com.jero.modules.activiti.process.common.enums.ProcessType;
@@ -19,7 +17,6 @@ import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO
import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitFlowUserVO;
import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService;
import com.jero.modules.activiti.process.esAnnualInit.mapper.ProcessEsAnnualInitMapper;
import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessNodeLinkService;
@@ -229,7 +226,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
return annualInitDataVO;
}
@Override
public void approvalProcess(AnnualInitDataVO annualInitData, boolean pass) {
String userId = UserUtils.getUserId();
@@ -321,6 +317,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
actFlowCommonService.completeTask(taskId, userId);
}
@Override
public void batchReject(AnnualInitDataVO annualInitDataVO, String prcId) {
// TODO 将对应数据找出来，然后设置驳回标志位
this.approvalProcess(annualInitDataVO, false);
}
@Override
public Map<String, Object> importData(MultipartFile file) {
List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
@@ -425,7 +427,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
item.setMainDraftingUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUser(), listDict));
item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setContactUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getContactUser(), listDict));
});
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
-7
View File
@@ -375,13 +375,6 @@ public class ProcessEsAnnualReport implements Serializable {
@ApiModelProperty(value = "执行Id")
private String executionId;
/**
* 创建人Id
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "创建人Id")
private String createUserId;
@TableField(exist = false)
private static final long serialVersionUID = 1L;