Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
b3738fe7 由 张雷
选项

分数统计功能

1 个父辈 4246dd0d
内嵌 并排
正在显示 14 个修改的文件 包含 171 行增加 和 18 行删除
sk-base-common/src/main/java/com/skua/modules/system/service/impl/PgServiceImpl.java
...@@ -194,8 +194,8 @@ public class PgServiceImpl implements IPgService { ...@@ -194,8 +194,8 @@ public class PgServiceImpl implements IPgService {
194 } 194 }
195 } 195 }
196 str.append("''"); 196 str.append("''");
197 String sql = "SELECT nm,v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " + 197 String sql = "SELECT nm,ROUND(AVG(CAST(v AS NUMERIC)),2) AS v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " +
198 " AND ts = ( SELECT max( ts ) FROM "+deviceId+"_count WHERE ts >= '"+start+"' AND ts <= '"+end+"' )"; 198 " AND ts >= '"+start+"' AND ts <= '"+end+"' GROUP BY nm";
199 list = pgDb.queryForList(sql); 199 list = pgDb.queryForList(sql);
200 }catch (Exception e){ 200 }catch (Exception e){
201 log.error("查询计算表出错"); 201 log.error("查询计算表出错");
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingController.java
...@@ -67,7 +67,6 @@ public class AjhMeetingController { ...@@ -67,7 +67,6 @@ public class AjhMeetingController {
67 * @author 开发者姓名, 开发时间 67 * @author 开发者姓名, 开发时间
68 * @Description: TODO(这里描述这个方法的需求变更情况) 68 * @Description: TODO(这里描述这个方法的需求变更情况)
69 */ 69 */
70
71 @AutoLog(value = "会议通知-分页列表查询") 70 @AutoLog(value = "会议通知-分页列表查询")
72 @ApiOperation(value="会议通知-分页列表查询", notes="会议通知-分页列表查询") 71 @ApiOperation(value="会议通知-分页列表查询", notes="会议通知-分页列表查询")
73 @GetMapping(value = "/list") 72 @GetMapping(value = "/list")
...@@ -83,6 +82,28 @@ public class AjhMeetingController { ...@@ -83,6 +82,28 @@ public class AjhMeetingController {
83 return result; 82 return result;
84 } 83 }
85 84
85 @AutoLog(value = "会议通知-撤回")
86 @ApiOperation(value="会议通知-撤回", notes="会议通知-撤回")
87 @GetMapping(value = "/revoke")
88 public Result<AjhMeeting> revokeRecord(String id) {
89 Result<AjhMeeting> result = new Result<AjhMeeting>();
90 boolean ok = false;
91 AjhMeeting ajhMeeting = ajhMeetingService.getById(id);
92 if(ConvertUtils.isNotEmpty(ajhMeeting)){
93 ok = ajhMeetingService.revoke(ajhMeeting);
94 if(ok){
95 result.success("撤回成功！");
96 }else{
97 result.error500("撤回失败！已有机构发布通知！");
98 }
99 }else{
100 result.error500("撤回失败！通知不存在！");
101 }
102 result.setSuccess(ok);
103 result.setResult(ajhMeeting);
104 return result;
105 }
106
86 /** 107 /**
87 * <pre> 108 * <pre>
88 * 添加 109 * 添加
...@@ -119,8 +140,8 @@ public class AjhMeetingController { ...@@ -119,8 +140,8 @@ public class AjhMeetingController {
119 @PostMapping(value = "/release") 140 @PostMapping(value = "/release")
120 public Result<AjhMeeting> release(@RequestBody AjhMeeting ajhMeeting) { 141 public Result<AjhMeeting> release(@RequestBody AjhMeeting ajhMeeting) {
121 Result<AjhMeeting> result = new Result<AjhMeeting>(); 142 Result<AjhMeeting> result = new Result<AjhMeeting>();
122 try {
123 boolean ok = false; 143 boolean ok = false;
144 try {
124 ajhMeeting.setSender(BaseContextHandler.getUserId()); 145 ajhMeeting.setSender(BaseContextHandler.getUserId());
125 ajhMeeting.setSendTime(new Date()); 146 ajhMeeting.setSendTime(new Date());
126 ajhMeeting.setSendStatus("1");//状态修改为已发布 147 ajhMeeting.setSendStatus("1");//状态修改为已发布
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
...@@ -349,12 +349,15 @@ public class AjhMeetingSendController { ...@@ -349,12 +349,15 @@ public class AjhMeetingSendController {
349 if(ajhMeetingSend != null ){ 349 if(ajhMeetingSend != null ){
350 if(StringUtils.isNotEmpty(ajhMeetingSend.getMeetCompere())){ 350 if(StringUtils.isNotEmpty(ajhMeetingSend.getMeetCompere())){
351 SysUser sysUser = userService.getById(ajhMeetingSend.getMeetCompere()); 351 SysUser sysUser = userService.getById(ajhMeetingSend.getMeetCompere());
352 ajhMeetingSend.setMeetCompereName( sysUser.getRealname()); 352 if(sysUser != null){
353 ajhMeetingSend.setMeetCompereName(sysUser.getRealname());
354 }
353 } 355 }
354
355 if(StringUtils.isNotEmpty(ajhMeetingSend.getDepartId()) && StringUtils.isEmpty(ajhMeetingSend.getDepartName())){ 356 if(StringUtils.isNotEmpty(ajhMeetingSend.getDepartId()) && StringUtils.isEmpty(ajhMeetingSend.getDepartName())){
356 SysDepart depart = departService.getById(ajhMeetingSend.getDepartId()); 357 SysDepart depart = departService.getById(ajhMeetingSend.getDepartId());
357 ajhMeetingSend.setDepartName( depart.getDepartName()); 358 if(depart != null){
359 ajhMeetingSend.setDepartName(depart.getDepartName());
360 }
358 } 361 }
359 } 362 }
360 if(ajhMeetingSend==null) { 363 if(ajhMeetingSend==null) {
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingService.java
...@@ -18,4 +18,6 @@ public interface IAjhMeetingService extends IService<AjhMeeting> { ...@@ -18,4 +18,6 @@ public interface IAjhMeetingService extends IService<AjhMeeting> {
18 IPage<AjhMeeting> queryPageList(Page<AjhMeeting> page, AjhMeeting ajhMeeting); 18 IPage<AjhMeeting> queryPageList(Page<AjhMeeting> page, AjhMeeting ajhMeeting);
19 19
20 AjhMeetingVO getDataById(String id); 20 AjhMeetingVO getDataById(String id);
21
22 boolean revoke(AjhMeeting ajhMeeting);
21 } 23 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingServiceImpl.java
1 package com.skua.modules.ajh.service.impl; 1 package com.skua.modules.ajh.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.skua.core.util.ConvertUtils;
5 import com.skua.modules.ajh.entity.AjhMeeting; 7 import com.skua.modules.ajh.entity.AjhMeeting;
6 import com.skua.modules.ajh.entity.AjhMeetingSend; 8 import com.skua.modules.ajh.entity.AjhMeetingSend;
7 import com.skua.modules.ajh.mapper.AjhMeetingMapper; 9 import com.skua.modules.ajh.mapper.AjhMeetingMapper;
...@@ -40,6 +42,16 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet ...@@ -40,6 +42,16 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
40 42
41 @Override 43 @Override
42 public void sendMeettingNotice(AjhMeeting ajhMeeting) { 44 public void sendMeettingNotice(AjhMeeting ajhMeeting) {
45 //判断是否已经创建完通知
46 QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
47 queryWrapper.eq("meet_id",ajhMeeting.getId());
48 List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
49 if(list.size() > 0){
50 for (AjhMeetingSend ajhMeetingSend : list) {
51 ajhMeetingSend.setSendStatus("0");
52 }
53 ajhMeetingSendService.saveOrUpdateBatch(list);
54 }else{
43 //获取所有的有会议权限的用户 55 //获取所有的有会议权限的用户
44 List<Map<String,String>> userList = ajhMeetingMapper.getMeetUsers(MEET_NOTICE_ROLE_CODE); 56 List<Map<String,String>> userList = ajhMeetingMapper.getMeetUsers(MEET_NOTICE_ROLE_CODE);
45 if(userList.size() > 0){ 57 if(userList.size() > 0){
...@@ -82,9 +94,8 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet ...@@ -82,9 +94,8 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
82 } 94 }
83 } 95 }
84 } 96 }
85
86 } 97 }
87 98 }
88 } 99 }
89 100
90 @Override 101 @Override
...@@ -99,4 +110,20 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet ...@@ -99,4 +110,20 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
99 AjhMeetingVO ajhMeeting = ajhMeetingMapper.getDataById(id); 110 AjhMeetingVO ajhMeeting = ajhMeetingMapper.getDataById(id);
100 return ajhMeeting; 111 return ajhMeeting;
101 } 112 }
113
114 @Override
115 public boolean revoke(AjhMeeting ajhMeeting) {
116 QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
117 queryWrapper.eq("meet_id",ajhMeeting.getId());
118 List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
119 for (AjhMeetingSend ajhMeetingSend : list) {
120 ajhMeetingSend.setSendStatus("2");
121 }
122 boolean ok = ajhMeetingSendService.saveOrUpdateBatch(list);
123 if(ok){
124 ajhMeeting.setSendStatus("0");//状态修改为未发布
125 ajhMeetingMapper.updateById(ajhMeeting);
126 }
127 return ok;
128 }
102 } 129 }
......
sk-module-biz/src/main/java/com/skua/modules/assessment/controller/DataAssessmentSocreMasterController.java
...@@ -11,6 +11,7 @@ import com.skua.core.util.ConvertUtils; ...@@ -11,6 +11,7 @@ import com.skua.core.util.ConvertUtils;
11 import com.skua.modules.assessment.entity.DataAssessmentSocreMaster; 11 import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
12 import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService; 12 import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
13 import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO; 13 import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
14 import com.skua.modules.emergency.entity.DangerousOperation;
14 import io.swagger.annotations.Api; 15 import io.swagger.annotations.Api;
15 import io.swagger.annotations.ApiOperation; 16 import io.swagger.annotations.ApiOperation;
16 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
...@@ -93,7 +94,8 @@ public class DataAssessmentSocreMasterController { ...@@ -93,7 +94,8 @@ public class DataAssessmentSocreMasterController {
93 QueryWrapper<DataAssessmentSocreMaster> query = new QueryWrapper<DataAssessmentSocreMaster>(); 94 QueryWrapper<DataAssessmentSocreMaster> query = new QueryWrapper<DataAssessmentSocreMaster>();
94 query.eq("report_id",dataAssessmentSocreMaster.getReportId()); 95 query.eq("report_id",dataAssessmentSocreMaster.getReportId());
95 query.eq("assessment_date",dataAssessmentSocreMaster.getAssessmentDate()); 96 query.eq("assessment_date",dataAssessmentSocreMaster.getAssessmentDate());
96 query.eq("assessment_user",dataAssessmentSocreMaster.getAssessmentUser()); 97 query.eq(ConvertUtils.isNotEmpty(dataAssessmentSocreMaster.getAssessmentUser()),"assessment_user",dataAssessmentSocreMaster.getAssessmentUser());
98 query.eq("depart_id",dataAssessmentSocreMaster.getDepartId());
97 List<DataAssessmentSocreMaster> list = dataAssessmentSocreMasterService.list(query); 99 List<DataAssessmentSocreMaster> list = dataAssessmentSocreMasterService.list(query);
98 if(list!=null&&list.size()>0) { 100 if(list!=null&&list.size()>0) {
99 result.setResult("yes"); 101 result.setResult("yes");
...@@ -185,6 +187,25 @@ public class DataAssessmentSocreMasterController { ...@@ -185,6 +187,25 @@ public class DataAssessmentSocreMasterController {
185 return result; 187 return result;
186 } 188 }
187 189
190 @AutoLog(value = "绩效考核基础信息-办结流程")
191 @ApiOperation(value = "绩效考核基础信息-办结流程", notes = "绩效考核基础信息-办结流程")
192 @PostMapping(value = "/complete-process")
193 public Result<DangerousOperation> completeProcess(@RequestBody DataAssessmentSocreMaster purchaseInfo) {
194 Result<DangerousOperation> result = new Result<>();
195 try {
196 boolean flag = dataAssessmentSocreMasterService.completeProcess(purchaseInfo);
197 if (flag) {
198 result.success("办结成功!");
199 } else {
200 result.error500("办结失败!");
201 }
202 } catch (Exception e) {
203 log.error(e.getMessage(), e);
204 result.error500("办结失败");
205 }
206 return result;
207 }
208
188 @AutoLog(value = "绩效考核基础信息-修改业务数据及流程数据") 209 @AutoLog(value = "绩效考核基础信息-修改业务数据及流程数据")
189 @ApiOperation(value="绩效考核基础信息-修改业务数据及流程数据", notes="绩效考核基础信息-修改业务数据及流程数据") 210 @ApiOperation(value="绩效考核基础信息-修改业务数据及流程数据", notes="绩效考核基础信息-修改业务数据及流程数据")
190 @PostMapping(value = "/editAndModifyProcess") 211 @PostMapping(value = "/editAndModifyProcess")
...@@ -202,7 +223,7 @@ public class DataAssessmentSocreMasterController { ...@@ -202,7 +223,7 @@ public class DataAssessmentSocreMasterController {
202 223
203 /** 224 /**
204 * 通过id查询 225 * 通过id查询
205 * @param id 226 * @param businessId
206 * @return 227 * @return
207 */ 228 */
208 @AutoLog(value = "绩效考核基础信息-通过id查询") 229 @AutoLog(value = "绩效考核基础信息-通过id查询")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/IDataAssessmentSocreMasterService.java
...@@ -49,4 +49,5 @@ public interface IDataAssessmentSocreMasterService extends IService<DataAssessme ...@@ -49,4 +49,5 @@ public interface IDataAssessmentSocreMasterService extends IService<DataAssessme
49 49
50 List<DataAssessmentSocreMasterVO> getAllData(DataAssessmentSocreMasterVO dataAssessmentSocreMasterVO); 50 List<DataAssessmentSocreMasterVO> getAllData(DataAssessmentSocreMasterVO dataAssessmentSocreMasterVO);
51 51
52 boolean completeProcess(DataAssessmentSocreMaster purchaseInfo);
52 } 53 }
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentItemServiceImpl.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.google.common.collect.Lists; 5 import com.google.common.collect.Lists;
6 import com.google.common.collect.Maps; 6 import com.google.common.collect.Maps;
7 import com.skua.core.context.BaseContextHandler; 7 import com.skua.core.context.BaseContextHandler;
8 import com.skua.core.util.ConvertUtils;
8 import com.skua.core.util.UUIDGenerator; 9 import com.skua.core.util.UUIDGenerator;
9 import com.skua.modules.assessment.entity.DataAssessmentItem; 10 import com.skua.modules.assessment.entity.DataAssessmentItem;
10 import com.skua.modules.assessment.entity.DataAssessmentMessage; 11 import com.skua.modules.assessment.entity.DataAssessmentMessage;
...@@ -223,8 +224,11 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte ...@@ -223,8 +224,11 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte
223 QueryWrapper<DataAssessmentSocreMaster> dataAssessmentSocreMasterQueryWrapper = new QueryWrapper<>(); 224 QueryWrapper<DataAssessmentSocreMaster> dataAssessmentSocreMasterQueryWrapper = new QueryWrapper<>();
224 dataAssessmentSocreMasterQueryWrapper.eq("report_id",reportId); 225 dataAssessmentSocreMasterQueryWrapper.eq("report_id",reportId);
225 dataAssessmentSocreMasterQueryWrapper.eq("assessment_date",dataMonth); 226 dataAssessmentSocreMasterQueryWrapper.eq("assessment_date",dataMonth);
226 dataAssessmentSocreMasterQueryWrapper.eq("assessment_user",userId); 227 dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(factoryId),"depart_id",factoryId);
227 DataAssessmentSocreMaster assessmentSocreMaster = dataAssessmentSocreMasterService.getOne(dataAssessmentSocreMasterQueryWrapper); 228 dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(userId),"assessment_user",userId);
229 List<DataAssessmentSocreMaster> masterList = dataAssessmentSocreMasterService.list(dataAssessmentSocreMasterQueryWrapper);
230 if(masterList.size()>0){
231 DataAssessmentSocreMaster assessmentSocreMaster = masterList.get(0);
228 assessmentSocreMaster.setAssessmentScore(totalScore); 232 assessmentSocreMaster.setAssessmentScore(totalScore);
229 assessmentSocreMaster.setLeaderScore(dataAssessmentItemSubmitVO.getLeaderScore()); 233 assessmentSocreMaster.setLeaderScore(dataAssessmentItemSubmitVO.getLeaderScore());
230 assessmentSocreMaster.setSelfScore(dataAssessmentItemSubmitVO.getSelfScore()); 234 assessmentSocreMaster.setSelfScore(dataAssessmentItemSubmitVO.getSelfScore());
...@@ -232,4 +236,5 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte ...@@ -232,4 +236,5 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte
232 } 236 }
233 } 237 }
234 } 238 }
239 }
235 } 240 }
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentSocreMasterServiceImpl.java
...@@ -6,6 +6,8 @@ import com.skua.modules.assessment.entity.DataAssessmentSocreMaster; ...@@ -6,6 +6,8 @@ import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
6 import com.skua.modules.assessment.mapper.DataAssessmentSocreMasterMapper; 6 import com.skua.modules.assessment.mapper.DataAssessmentSocreMasterMapper;
7 import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService; 7 import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
8 import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO; 8 import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
9 import com.skua.modules.emergency.entity.DangerousOperation;
10 import com.skua.modules.flow.business.service.FlowBusinessService;
9 import com.skua.modules.flow.business.service.IFlowService; 11 import com.skua.modules.flow.business.service.IFlowService;
10 import com.skua.modules.flow.core.constant.ProcessConstant; 12 import com.skua.modules.flow.core.constant.ProcessConstant;
11 import com.skua.modules.flow.core.entity.BladeFlow; 13 import com.skua.modules.flow.core.entity.BladeFlow;
...@@ -13,22 +15,31 @@ import com.skua.modules.flow.core.utils.FlowUtil; ...@@ -13,22 +15,31 @@ import com.skua.modules.flow.core.utils.FlowUtil;
13 import com.skua.modules.flow.support.Kv; 15 import com.skua.modules.flow.support.Kv;
14 import com.skua.modules.flow.utils.Func; 16 import com.skua.modules.flow.utils.Func;
15 17
18 import java.text.SimpleDateFormat;
19 import java.util.Date;
16 import java.util.List; 20 import java.util.List;
17 import java.util.Map; 21 import java.util.Map;
18 22
23 import com.skua.modules.safe.service.IEnvironmentTargetService;
19 import org.springframework.beans.factory.annotation.Autowired; 24 import org.springframework.beans.factory.annotation.Autowired;
20 import org.springframework.stereotype.Service; 25 import org.springframework.stereotype.Service;
21 26
22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 27 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
23 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 28 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
29 import org.springframework.transaction.annotation.Transactional;
24 30
25 /** 31 /**
26 * 绩效考核评分基础信息 32 * 绩效考核评分基础信息
27 */ 33 */
28 @Service 34 @Service
29 public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssessmentSocreMasterMapper, DataAssessmentSocreMaster> implements IDataAssessmentSocreMasterService { 35 public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssessmentSocreMasterMapper, DataAssessmentSocreMaster> implements IDataAssessmentSocreMasterService {
36
30 @Autowired 37 @Autowired
31 private IFlowService flowService; 38 private IFlowService flowService;
39 @Autowired
40 private FlowBusinessService flowBusinessService;
41 @Autowired
42 private IEnvironmentTargetService environmentTargetService;
32 43
33 @Override 44 @Override
34 public Page<DataAssessmentSocreMasterVO> queryCustomPageList(Page<DataAssessmentSocreMasterVO> pageList, 45 public Page<DataAssessmentSocreMasterVO> queryCustomPageList(Page<DataAssessmentSocreMasterVO> pageList,
...@@ -79,5 +90,22 @@ public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssess ...@@ -79,5 +90,22 @@ public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssess
79 return baseMapper.getAllData(dataAssessmentSocreMasterVO); 90 return baseMapper.getAllData(dataAssessmentSocreMasterVO);
80 } 91 }
81 92
93 @Override
94 @Transactional(rollbackFor = Exception.class)
95 public boolean completeProcess(DataAssessmentSocreMaster assessmentSocreMaster) {
96 boolean flag = false;//返回结果
97 DataAssessmentSocreMaster dataAssessmentSocreMaster = baseMapper.selectById(assessmentSocreMaster.getId());
98 if(dataAssessmentSocreMaster!=null){
99 this.updateById(dataAssessmentSocreMaster);
100 //调用同意接口
101 flag = flowBusinessService.completeTask(ProcessConstant.PASS_KEY, assessmentSocreMaster.getFlow());
102 //同步分数入环保目标表 写死 安全环保责任状ID
103 if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())||
104 "1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
105 environmentTargetService.addOrEdit(dataAssessmentSocreMaster);
106 }
107 }
108 return flag;
109 }
82 110
83 } 111 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IEnvironmentTargetService.java
1 package com.skua.modules.safe.service; 1 package com.skua.modules.safe.service;
2 2
3 import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
3 import com.skua.modules.safe.entity.EnvironmentTarget; 4 import com.skua.modules.safe.entity.EnvironmentTarget;
4 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
6 import org.springframework.scheduling.annotation.Async;
5 7
6 /** 8 /**
7 * 安环环保目标 9 * 安环环保目标
...@@ -9,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -9,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
9 public interface IEnvironmentTargetService extends IService<EnvironmentTarget> { 11 public interface IEnvironmentTargetService extends IService<EnvironmentTarget> {
10 12
11 boolean checkData(String departId, String targetYear); 13 boolean checkData(String departId, String targetYear);
14
15 @Async
16 void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster);
12 } 17 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/EnvironmentTargetServiceImpl.java
1 package com.skua.modules.safe.service.impl; 1 package com.skua.modules.safe.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
4 import com.skua.modules.safe.entity.EnvironmentTarget; 5 import com.skua.modules.safe.entity.EnvironmentTarget;
5 import com.skua.modules.safe.mapper.EnvironmentTargetMapper; 6 import com.skua.modules.safe.mapper.EnvironmentTargetMapper;
6 import com.skua.modules.safe.service.IEnvironmentTargetService; 7 import com.skua.modules.safe.service.IEnvironmentTargetService;
8 import io.swagger.annotations.ApiModelProperty;
9 import org.jeecgframework.poi.excel.annotation.Excel;
10 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
8 12
9 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 13 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -16,6 +20,9 @@ import java.util.List; ...@@ -16,6 +20,9 @@ import java.util.List;
16 @Service 20 @Service
17 public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetMapper, EnvironmentTarget> implements IEnvironmentTargetService { 21 public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetMapper, EnvironmentTarget> implements IEnvironmentTargetService {
18 22
23 @Autowired
24 private EnvironmentTargetMapper environmentTargetMapper;
25
19 /*** 26 /***
20 * 校验一个水厂一年只能提交一次数据 27 * 校验一个水厂一年只能提交一次数据
21 * @param departId 28 * @param departId
...@@ -32,5 +39,36 @@ public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetM ...@@ -32,5 +39,36 @@ public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetM
32 } 39 }
33 return true; 40 return true;
34 } 41 }
42
43 @Override
44 public void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster) {
45 EnvironmentTarget environmentTarget = new EnvironmentTarget();
46 environmentTarget.setDepartId(dataAssessmentSocreMaster.getDepartId());
47 environmentTarget.setTargetYear(dataAssessmentSocreMaster.getAssessmentDate());
48 //1859413989066813442 //安全环保目标责任状（约束指标） constraintScore
49 if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())){
50 environmentTarget.setConstraintScore(dataAssessmentSocreMaster.getSelfScore());
51 }
52 //1872156241933414401 //安全环保目标责任状（责任指标） liabilityScore
53 if("1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
54 environmentTarget.setLiabilityScore(dataAssessmentSocreMaster.getSelfScore());
55 }
56 QueryWrapper<EnvironmentTarget> queryWrapper = new QueryWrapper();
57 queryWrapper.eq("depart_id" ,dataAssessmentSocreMaster.getDepartId()) ;
58 queryWrapper.eq("target_year" ,dataAssessmentSocreMaster.getAssessmentDate()) ;
59 List<EnvironmentTarget> list = this.baseMapper.selectList(queryWrapper);
60 if (list != null && !list.isEmpty()) {
61 EnvironmentTarget oldEnvironmentTarget = list.get(0);
62 environmentTarget.setId(oldEnvironmentTarget.getId());
63 environmentTarget.setDepartAncestors(oldEnvironmentTarget.getDepartAncestors());
64 environmentTarget.setWorkerDeathNum(oldEnvironmentTarget.getWorkerDeathNum());
65 environmentTarget.setSuddenlyNum(oldEnvironmentTarget.getSuddenlyNum());
66 environmentTarget.setNewCaseNum(oldEnvironmentTarget.getNewCaseNum());
67 environmentTarget.setExamScore(oldEnvironmentTarget.getExamScore());
68 environmentTargetMapper.updateById(oldEnvironmentTarget);
69 }else{
70 environmentTargetMapper.insert(environmentTarget);
71 }
72 }
35 } 73 }
36 74
......
sk-module-datafill/src/main/java/com/skua/modules/job/DayDataSyncJob.java
...@@ -35,7 +35,7 @@ public class DayDataSyncJob implements Job { ...@@ -35,7 +35,7 @@ public class DayDataSyncJob implements Job {
35 private ISysFactoryDeviceService sysFactoryDeviceService; 35 private ISysFactoryDeviceService sysFactoryDeviceService;
36 @Autowired 36 @Autowired
37 private IReportDataService reportDataService; 37 private IReportDataService reportDataService;
38 private DecimalFormat df = new DecimalFormat("######0.0000"); 38 private DecimalFormat df = new DecimalFormat("######0");
39 39
40 /** 40 /**
41 * 若参数变量名修改 QuartzJobController中也需对应修改 41 * 若参数变量名修改 QuartzJobController中也需对应修改
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentRepair.java
1 package com.skua.modules.equipment.entity; 1 package com.skua.modules.equipment.entity;
2 2
3 import java.io.Serializable;
4 import java.util.Date;
5 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 5 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField;
9 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
10 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
11 import lombok.Data; 8 import lombok.Data;
...@@ -13,7 +10,6 @@ import lombok.EqualsAndHashCode; ...@@ -13,7 +10,6 @@ import lombok.EqualsAndHashCode;
13 import lombok.experimental.Accessors; 10 import lombok.experimental.Accessors;
14 import com.fasterxml.jackson.annotation.JsonFormat; 11 import com.fasterxml.jackson.annotation.JsonFormat;
15 import com.skua.core.aspect.annotation.Dict; 12 import com.skua.core.aspect.annotation.Dict;
16
17 import org.springframework.format.annotation.DateTimeFormat; 13 import org.springframework.format.annotation.DateTimeFormat;
18 import org.jeecgframework.poi.excel.annotation.Excel; 14 import org.jeecgframework.poi.excel.annotation.Excel;
19 15
...@@ -168,6 +164,9 @@ public class EquipmentRepair { ...@@ -168,6 +164,9 @@ public class EquipmentRepair {
168 @Excel(name = "委外附件", width = 15) 164 @Excel(name = "委外附件", width = 15)
169 @ApiModelProperty(value = "委外附件") 165 @ApiModelProperty(value = "委外附件")
170 private java.lang.String outsourceFilepath; 166 private java.lang.String outsourceFilepath;
167 /**维修费用*/
168 @ApiModelProperty(value = "维修费用")
169 private java.lang.String totalCost;
171 /**验收人员*/ 170 /**验收人员*/
172 @Excel(name = "验收人员", width = 15) 171 @Excel(name = "验收人员", width = 15)
173 @ApiModelProperty(value = "验收人员") 172 @ApiModelProperty(value = "验收人员")
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentRepairVO.java
...@@ -122,6 +122,9 @@ public class EquipmentRepairVO extends FlowEntity { ...@@ -122,6 +122,9 @@ public class EquipmentRepairVO extends FlowEntity {
122 @Excel(name = "维修用时", width = 15) 122 @Excel(name = "维修用时", width = 15)
123 @ApiModelProperty(value = "维修用时") 123 @ApiModelProperty(value = "维修用时")
124 private java.lang.Double costHour; 124 private java.lang.Double costHour;
125 /**维修费用*/
126 @ApiModelProperty(value = "维修费用")
127 private java.lang.String totalCost;
125 /**故障原因*/ 128 /**故障原因*/
126 @Excel(name = "故障原因", width = 15) 129 @Excel(name = "故障原因", width = 15)
127 @ApiModelProperty(value = "故障原因") 130 @ApiModelProperty(value = "故障原因")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!