Home Explore Help
Sign In
asiainfo
/
ebc
Watch 4
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 356 Releases 0 Wiki
Browse Source

修改日报bug

wangchao 4 years ago
parent
0bf75d3a8d
commit
9025dc6284
3 changed files with 77 additions and 67 deletions
Split View Show Diff Stats
  1. 55 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/CharSpecController.java
  2. 0 46
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/vacationAttendanceManageController.java
  3. 22 21
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

+ 55 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/CharSpecController.java
View File 

@ -0,0 +1,55 @@
1 
package com.ai.bss.security.protection.controller;
2
3 
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
4 
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
5 
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
6 
import com.github.pagehelper.PageInfo;
7 
import org.slf4j.Logger;
8 
import org.slf4j.LoggerFactory;
9 
import org.springframework.beans.factory.annotation.Autowired;
10 
import org.springframework.stereotype.Controller;
11 
import org.springframework.web.bind.annotation.RequestMapping;
12 
import org.springframework.web.bind.annotation.RequestParam;
13 
import org.springframework.web.bind.annotation.ResponseBody;
14
15 
import java.util.Date;
16 
import java.util.List;
17 
import java.util.Map;
18
19 
/**
20 
 * 获取字典表属性
21 
 */
22 
@Controller
23 
@RequestMapping("/charSpec")
24 
public class CharSpecController {
25 
	Logger logger = LoggerFactory.getLogger(CharSpecController.class);
26
27 
	@Autowired
28 
	CharSpecService charSpecService;
29
30 
	/**
31 
	 * 根据特征属性编码获取对应的属性值
32 
	 * @param charSpecCode 特征属性编码
33 
	 * @return
34 
	 * @throws Exception
35 
	 */
36 
	@ResponseBody
37 
	@RequestMapping("/getCharSpecList")
38 
	public List<CharacteristicSpecValue> getCharSpecList(@RequestParam("charSpecCode") String charSpecCode) throws Exception {
39 
		List<CharacteristicSpecValue> charSpecList = charSpecService.getCharSpecList(charSpecCode);
40 
		return charSpecList;
41 
	}
42
43 
	/**
44 
	 * 根据特征属性编码获取对应的属性值，并以code—>value的形式存放到Map中
45 
	 * @param charSpecCode 特征属性编码
46 
	 * @return
47 
	 * @throws Exception
48 
	 */
49 
	@ResponseBody
50 
	@RequestMapping("/getCharSpecMap")
51 
	public Map<String, String> getCharSpecMap(@RequestParam("charSpecCode") String charSpecCode){
52 
		Map<String, String> charSpecMap = charSpecService.getCharSpecMap(charSpecCode);
53 
		return charSpecMap;
54 
	}
55 
}

+ 0 - 46
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/vacationAttendanceManageController.java
View File 

@ -1,46 +0,0 @@
1 
package com.ai.bss.security.protection.controller;
2
3 
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
4 
import com.github.pagehelper.PageInfo;
5 
import org.slf4j.Logger;
6 
import org.slf4j.LoggerFactory;
7 
import org.springframework.beans.factory.annotation.Autowired;
8 
import org.springframework.stereotype.Controller;
9 
import org.springframework.web.bind.annotation.RequestMapping;
10 
import org.springframework.web.bind.annotation.ResponseBody;
11
12 
import java.util.Date;
13 
import java.util.Map;
14
15 
/**
16 
 * 假勤管理
17 
 */
18 
@Controller
19 
@RequestMapping("/vacationAttendanceManage")
20 
public class vacationAttendanceManageController {
21 
	Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
22
23 
	@Autowired
24 
	AreaInRecordService areaInRecordService;
25
26 
	/**
27 
	 * 分页查询考勤统计分析
28 
	 */
29
30 
	@ResponseBody
31 
	@RequestMapping("/queryPageAttendanceCount")
32 
	public PageInfo queryPageAttendanceCount(Map params) throws Exception {
33 
		// 当前页数
34 
		int pageNum = (int)params.get("pageNum") < 1 ? 1 : (int)params.get("pageNum");
35 
		// 每页条数
36 
		int pageSize = (int)params.get("pageSize") < 1 ? 1: (int)params.get("pageSize");
37 
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
38 
			params.put("currentDate",new Date());
39 
		}
40 
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
41
42
43 
		return pageInfo;
44
45 
	}
46 
}

+ 22 - 21
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java
View File 

@ -121,10 +121,10 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
121 121 
            attendanceReportList.forEach((dailyAttendance)->{
122 122
123 123 
                clockingStatusList.forEach((clockingStatus)->{
124 
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
124 
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goToWorkStatus"))){
125 125 
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
126 126 
                    }
127 
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
127 
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goOffWorkStatus"))){
128 128 
                        dailyAttendance.put("goOffWorkStatus", clockingStatus.getValue());
129 129 
                    }
130 130 
                });
 
@ -132,26 +132,26 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
132 132 
                String[] attendanceStatusArray = new String[2];
133 133 
                dailyAttendance.put("date",dailyAttendance.get("workDay"));
134 134 
                dailyAttendance.put("isAbnormal",true);
135 
                if(dailyAttendance.get("goToWorkStatus").equals("正常")&&dailyAttendance.get("goOffWorkStatus").equals("正常")){
135 
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
136 136 
                    //上下班都正常
137 137 
                    dailyAttendance.put("isAbnormal",false);
138 138 
                    attendanceStatusArray[0]="正常";
139 139 
                    dailyAttendance.put("descr",attendanceStatusArray);
140 
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
140 
                }else if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
141 141 
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
142 142 
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
143 143 
                    //上下班都不正常
144 
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
144 
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
145 145 
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
146 146 
                    }
147 
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
147 
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
148 148 
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
149 149 
                    }
150 
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
150 
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
151 151 
                        attendanceStatusArray[1]=null;
152 152 
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
153 153 
                    }
154 
                    if(dailyAttendance.get("goToWorkStatus").equals("倒休")||dailyAttendance.get("goToWorkStatus").equals("事假")||dailyAttendance.get("goToWorkStatus").equals("年假")||dailyAttendance.get("goToWorkStatus").equals("放假")){
154 
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
155 155 
                        attendanceStatusArray[1]=null;
156 156 
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
157 157 
                    }
 
@ -159,7 +159,7 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
159 159 
                    dailyAttendance.put("descr",attendanceStatusArray);
160 160 
                }else{
161 161 
                    //上下班一个正常一个不正常
162 
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
162 
                    if("正常".equals(dailyAttendance.get("goToWorkStatus"))){
163 163 
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
164 164 
                    }else{
165 165 
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
 
@ -215,48 +215,49 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
215 215 
                });
216 216
217 217 
                clockingStatusList.forEach((clockingStatus)->{
218 
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
218 
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goToWorkStatus"))){
219 219 
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
220 220 
                    }
221 
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
221 
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goOffWorkStatus"))){
222 222 
                        dailyAttendance.put("goOffWorkStatus", clockingStatus.getValue());
223 223 
                    }
224 224 
                });
225 225
226 226 
                String[] attendanceStatusArray = new String[2];
227 227
228 
                if(dailyAttendance.get("goToWorkStatus").equals("正常")&&dailyAttendance.get("goOffWorkStatus").equals("正常")){
228 
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
229 229 
                    //上下班都正常
230 
                    dailyAttendance.put("isAbnormal",false);
230 231 
                    attendanceStatusArray[0]="正常";
231 
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
232 
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
232 
                    dailyAttendance.put("descr",attendanceStatusArray);
233 
                }else if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
233 234 
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
234 235 
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
235 236 
                    //上下班都不正常
236 
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
237 
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
237 238 
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
238 239 
                    }
239 
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
240 
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
240 241 
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
241 242 
                    }
242 
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
243 
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
243 244 
                        attendanceStatusArray[1]=null;
244 245 
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
245 246 
                    }
246 
                    if(dailyAttendance.get("goToWorkStatus").equals("倒休")||dailyAttendance.get("goToWorkStatus").equals("事假")||dailyAttendance.get("goToWorkStatus").equals("年假")||dailyAttendance.get("goToWorkStatus").equals("放假")){
247 
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
247 248 
                        attendanceStatusArray[1]=null;
248 249 
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
249 250 
                    }
250 251
251 
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
252 
                    dailyAttendance.put("descr",attendanceStatusArray);
252 253 
                }else{
253 254 
                    //上下班一个正常一个不正常
254 
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
255 
                    if("正常".equals(dailyAttendance.get("goToWorkStatus"))){
255 256 
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
256 257 
                    }else{
257 258 
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
258 259 
                    }
259 
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
260 
                    dailyAttendance.put("descr",attendanceStatusArray);
260 261 
                }
261 262 
            });
262 263 
        } catch (ParseException e) {