草稿

common/src/main/java/com/jpsoft/shinestar/modules/business/service/FillAttendanceService.java

@@ -18,7 +18,7 @@ public interface FillAttendanceService {
 	Page<FillAttendance> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
     FillAttendance insertAndfile(String workAttendanceId, String workAttendanceDate, String workAttendanceTime,
                                  String content, String type, String photoFile, String longitude, String latitude,
-                                 String approvalPersonId, Long personId, String alarmConfigId, String address, String attendanceType,String ids,String draft) throws Exception;
+                                 String approvalPersonId, Long personId, String alarmConfigId, String address, String attendanceType) throws Exception;
 
 
 	void updateAndWorkAtten(PersonInfo personInfo, String content, FillAttendance fillAttendance);

common/src/main/java/com/jpsoft/shinestar/modules/business/service/SupplementWorkService.java

@@ -17,7 +17,7 @@ public interface SupplementWorkService {
 	List<SupplementWork> list();
 	Page<SupplementWork> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 
-    String supplementWorkSubmit(PersonPopedom personPopedom, String id, String reason,String imageUrl, String formId) throws Exception;
+    String supplementWorkSubmit(PersonPopedom personPopedom, String id, String reason,String imageUrl, String formId,String ids,String draft) throws Exception;
 
     String supplementWorkBatchSubmit(PersonPopedom personPopedom, String date,String personIds, String reason, String imageUrl, String formId,String ids,String draft) throws Exception;
 }

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/FillAttendanceServiceImpl.java

@@ -114,7 +114,7 @@ public class FillAttendanceServiceImpl implements FillAttendanceService {
     @Override
     public FillAttendance insertAndfile(String workAttendanceId, String workAttendanceDate, String workAttendanceTime,
                                         String content, String type, String photoFile,String longitude,String latitude,
-                                        String approvalPersonId,Long personId,String alarmConfigId,String address,String attendanceType,String ids,String draft) throws Exception{
+                                        String approvalPersonId,Long personId,String alarmConfigId,String address,String attendanceType) throws Exception{
         WorkAttendance workAttendance = null;
 
         if (StringUtils.isNotBlank(workAttendanceId)){

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/SupplementWorkServiceImpl.java

@@ -117,7 +117,7 @@ public class SupplementWorkServiceImpl implements SupplementWorkService {
 	}
 
 	@Override
-	public String supplementWorkSubmit(PersonPopedom personPopedom, String id, String reason, String imageUrl,String formId) throws Exception {
+	public String supplementWorkSubmit(PersonPopedom personPopedom, String id, String reason, String imageUrl,String formId,String ids,String draft) throws Exception {
 
 		//考勤记录
 		WorkScheduleAttendance workScheduleAttendance = workScheduleAttendanceService.get(id);
@@ -132,12 +132,16 @@ public class SupplementWorkServiceImpl implements SupplementWorkService {
 		supplementWork.setAttendanceDate(DateUtil.format(workScheduleAttendance.getRecordTime(),"yyyy-MM-dd HH:mm"));
 		supplementWork.setClassify(workScheduleAttendance.getClassify());
 		supplementWork.setType("1");
-		supplementWork.setStatus("0");
+		supplementWork.setStatus("-99");
 		supplementWork.setSubmitTime(new Date());
 		supplementWork.setReason(reason);
 		supplementWork.setImageUrl(imageUrl);
 		supplementWork.setCreateTime(new Date());
-		insert(supplementWork);
+		if(StringUtils.isNotEmpty(ids)){
+			update(supplementWork);
+		}else {
+			insert(supplementWork);
+		}
 
 		//新增个人记录
 		SupplementWorkPerson supplementWorkPerson = new SupplementWorkPerson();
@@ -152,40 +156,41 @@ public class SupplementWorkServiceImpl implements SupplementWorkService {
 		workScheduleAttendance.setSupplementWorkPersonId(supplementWorkPerson.getId());
 		workScheduleAttendanceService.update(workScheduleAttendance);
 
-		//创建审核流程id
-		String procinstId =  procinstService.addProcinst(supplementWork.getId(),null,"补卡",formId,personPopedom,null);
-
-		supplementWork.setProcinstId(procinstId);
-		update(supplementWork);
+		if (draft == "1") {
+			//创建审核流程id
+			String procinstId = procinstService.addProcinst(supplementWork.getId(), null, "补卡", formId, personPopedom, null);
 
+			supplementWork.setProcinstId(procinstId);
+			update(supplementWork);
+			supplementWork.setStatus("0");
 
 
+			ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
 
-		ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
+			if (procinstActivity != null) {
+				List<ProcinstActUser> procinstActUserList = procinstActUserService.findByProcinstActivityIdActionType(procinstActivity.getId(), "0", "1");
+				if (procinstActUserList.size() > 0) {
 
-		if (procinstActivity != null) {
-			List<ProcinstActUser> procinstActUserList = procinstActUserService.findByProcinstActivityIdActionType(procinstActivity.getId(), "0", "1");
-			if (procinstActUserList.size() > 0) {
+					new Thread(() -> {
+						for (ProcinstActUser procinstActUser : procinstActUserList) {
+							try {
+								PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
 
-				new Thread(() -> {
-					for (ProcinstActUser procinstActUser : procinstActUserList) {
-						try{
-							PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
+								//提交人
+								PersonInfo personInfo1 = personInfoService.get(personPopedom.getPersonId());
+								String accessToken = JwtUtil2.createToken(jwtSecret, personInfo.getId() + "", DateTime.now().plusHours(30 * 24).toDate());
+								WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的补卡信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + supplementWork.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId + "&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
+							} catch (Exception ex) {
+								ex.printStackTrace();
+							}
 
-							//提交人
-							PersonInfo personInfo1 = personInfoService.get(personPopedom.getPersonId());
-							String accessToken = JwtUtil2.createToken(jwtSecret, personInfo.getId() + "", DateTime.now().plusHours(30 * 24).toDate());
-							WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的补卡信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + supplementWork.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId +"&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
-						}catch (Exception ex){
-							ex.printStackTrace();
 						}
+					}).start();
 
-					}
-				}).start();
-
+				}
 			}
-		}
 
+		}
 
 
 

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/WorkAttendanceApiController.java

@@ -454,11 +454,10 @@ public class WorkAttendanceApiController {
             @ApiImplicitParam(name = "latitude", value = "纬度", required = false, paramType = "form"),
             @ApiImplicitParam(name = "address", value = "打卡地址", required = false, paramType = "form"),
             @ApiImplicitParam(name = "approvalPersonId", value = "审核人", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "attendanceType", value = "外出/出差（2/3）", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "draft", value = "状态（0：草稿，1：提交）", required = true, paramType = "form")
+            @ApiImplicitParam(name = "attendanceType", value = "外出/出差（2/3）", required = false, paramType = "form")
     })
     public MessageResult<WorkAttendanceDTO> postPatchCard(
-            String ids,String draft,String workAttendanceId, String alarmConfigId,
+            String workAttendanceId, String alarmConfigId,
             @RequestParam("workAttendanceDate") String workAttendanceDate,
             @RequestParam("workAttendanceTime") String workAttendanceTime,
             @RequestParam("type") String type,
@@ -525,7 +524,7 @@ public class WorkAttendanceApiController {
 
             FillAttendance fillAttendance = fillAttendanceService.insertAndfile(workAttendanceId, workAttendanceDate,
                     workAttendanceTime, content, type, photoFile, longitude, latitude,
-                    approvalPersonId, personInfo.getId(), alarmConfigId, address, attendanceType,draft,ids);
+                    approvalPersonId, personInfo.getId(), alarmConfigId, address, attendanceType);
 
 
             WorkAttendanceDTO workAttendanceDTO = new WorkAttendanceDTO();
@@ -594,8 +593,9 @@ public class WorkAttendanceApiController {
             @ApiImplicitParam(name = "reason", value = "申请理由", required = true, paramType = "form"),
             @ApiImplicitParam(name = "imageUrl", value = "照片地址", required = false, paramType = "form"),
             @ApiImplicitParam(name = "formId", value = "标识", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "draft", value = "状态（0：草稿，1：提交）", required = true, paramType = "form")
     })
-    public MessageResult<Map> supplementWorkSubmit(String id, String reason, String imageUrl,String formId, String token, @RequestAttribute String subject) {
+    public MessageResult<Map> supplementWorkSubmit(String ids,String draft,String id, String reason, String imageUrl,String formId, String token, @RequestAttribute String subject) {
 
 
         MessageResult<Map> messageResult = new MessageResult<>();
@@ -605,7 +605,7 @@ public class WorkAttendanceApiController {
             PersonPopedom personPopedom = personPopedomService.get(person.getPopedom());
 
 
-            String supplementWorkId = supplementWorkService.supplementWorkSubmit(personPopedom, id, reason,imageUrl, formId);
+            String supplementWorkId = supplementWorkService.supplementWorkSubmit(personPopedom, id, reason,imageUrl, formId,ids,draft);
 
             Map<String, Object> map = new HashMap<>();
             map.put("id", supplementWorkId);