xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.项目立项季度考核增加判断，平台专项/目标责任才有季度考核

Browse Source 
2.季度考核表增加ext映射
This commit is contained in:
zty 2024-07-12 09:52:59 +08:00
parent b5b50fd720
commit 5b3cb53cb9
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
View File

@ -60,47 +60,54 @@ public class ProjectInitListener implements ExecutionListener {
} }
//根据部门批量添加部门周报填报 //根据部门批量添加部门周报填报
// JSONArray depts = (JSONArray) ext.get("executeDepts"); JSONArray depts = (JSONArray) ext.get("executeDepts");
ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>(); ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>();
// if (!ObjectUtils.isEmpty(depts)) { if (!ObjectUtils.isEmpty(depts)) {
// depts.forEach(a -> { depts.forEach(a -> {
// ProjectWeekly projectWeekly = new ProjectWeekly(); ProjectWeekly projectWeekly = new ProjectWeekly();
// projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
// projectWeekly.setWeeklyType("1"); projectWeekly.setWeeklyType("1");
// projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
// projectWeekly.setDeptId(a.toString()); projectWeekly.setDeptId(a.toString());
// weeklyArrayList.add(projectWeekly); weeklyArrayList.add(projectWeekly);
// }); });
//添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时） //添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时）
String draftManId = String.valueOf(ext.get("draftManId")); String draftManId = String.valueOf(ext.get("draftManId"));
JSONArray projectManagerData = (JSONArray) ext.get("projectManagerData"); JSONArray projectManagerData = (JSONArray) ext.get("projectManagerData");
String projectManager = String.valueOf(projectManagerData.get(1)); String projectManager = String.valueOf(projectManagerData.get(1));
ArrayList<String> list = new ArrayList<>(); ArrayList<String> list = new ArrayList<>();
list.add(draftManId); list.add(draftManId);
if (!draftManId.equals(projectManager)) list.add(projectManager);//避免角色是同一个人重复 if (!draftManId.equals(projectManager)) list.add(projectManager);//避免角色是同一个人重复
list.forEach(a -> { list.forEach(a -> {
ProjectWeekly projectWeekly = new ProjectWeekly(); ProjectWeekly projectWeekly = new ProjectWeekly();
projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
projectWeekly.setWeeklyType("1"); projectWeekly.setWeeklyType("1");
projectWeekly.setDeptId(""); projectWeekly.setDeptId("");
projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
projectWeekly.setIsDeleted("1"); projectWeekly.setIsDeleted("1");
projectWeekly.setUserId(a); projectWeekly.setUserId(a);
projectWeekly.setCreatedBy(a); projectWeekly.setCreatedBy(a);
weeklyArrayList.add(projectWeekly); weeklyArrayList.add(projectWeekly);
}); });
projectWeeklyService.insertBatch(weeklyArrayList); projectWeeklyService.insertBatch(weeklyArrayList);
//添加季度审核数据 //平台专项类/目标责任类才有季度考核
ProjectQuarterlyEvaluation quarterlyEvaluation = new ProjectQuarterlyEvaluation(); //添加季度审核数据
quarterlyEvaluation.setCreatedBy(projectManager); if ("5".equals(openRange) || "6".equals(openRange)) {
quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis())); ProjectQuarterlyEvaluation quarterlyEvaluation = new ProjectQuarterlyEvaluation();
quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId())); quarterlyEvaluation.setCreatedBy(projectManager);
projectQuarterlyEvaluationService.insert(quarterlyEvaluation); JSONArray projectAdmin = (JSONArray) ext.get("projectAdmin");
JSONObject jsonObject = new JSONObject();
jsonObject.put("projectAdmin",projectAdmin.get(1));
quarterlyEvaluation.setExt(jsonObject);
quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis()));
quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId()));
projectQuarterlyEvaluationService.insert(quarterlyEvaluation);
}
}
} }
} }
// }
} catch (Exception e) { } catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("ProjectInitListener.notify", e); log.error("ProjectInitListener.notify", e);

2
src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml
View File

@ -7,7 +7,7 @@
<resultMap id="BaseResultMap" type="com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation"> <resultMap id="BaseResultMap" type="com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation">
<id property="id" column="id_" jdbcType="VARCHAR"/> <id property="id" column="id_" jdbcType="VARCHAR"/>
<result property="projectId" column="project_id" jdbcType="VARCHAR"/> <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
<result property="ext" column="ext_" jdbcType="OTHER"/> <result property="ext" column="ext_" jdbcType="JAVA_OBJECT" />
<result property="isDeleted" column="is_deleted" jdbcType="VARCHAR"/> <result property="isDeleted" column="is_deleted" jdbcType="VARCHAR"/>
<result property="createdBy" column="created_by" jdbcType="VARCHAR"/> <result property="createdBy" column="created_by" jdbcType="VARCHAR"/>
<result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/> <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>