草稿

common/src/main/java/com/jpsoft/shinestar/modules/base/service/CustomerDiningRecordService.java

@@ -23,5 +23,5 @@ public interface CustomerDiningRecordService {
     List<CustomerDiningRecord> list();
     Page<CustomerDiningRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 
-    String customerDiningSubmit(PersonPopedom personPopedom, String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime, String diningName, String diningFee, String formId) throws Exception;
+    String customerDiningSubmit(PersonPopedom personPopedom, String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime, String diningName, String diningFee, String formId,String ids,String draft) throws Exception;
 }

common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/CustomerDiningRecordServiceImpl.java

@@ -114,7 +114,7 @@ public class CustomerDiningRecordServiceImpl implements CustomerDiningRecordServ
     }
 
     @Override
-    public String customerDiningSubmit(PersonPopedom personPopedom, String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime, String diningName, String diningFee, String formId) throws Exception {
+    public String customerDiningSubmit(PersonPopedom personPopedom, String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime, String diningName, String diningFee, String formId,String ids,String draft) throws Exception {
 
 
         CustomerDiningRecord customerDiningRecord = new CustomerDiningRecord();
@@ -128,41 +128,49 @@ public class CustomerDiningRecordServiceImpl implements CustomerDiningRecordServ
         customerDiningRecord.setDiningTime(DateUtil.parse(diningTime));
         customerDiningRecord.setDiningName(diningName);
         customerDiningRecord.setDiningFee(new BigDecimal(diningFee));
-        customerDiningRecord.setStatus("0");
+        customerDiningRecord.setStatus("-99");
         customerDiningRecord.setCreateTime(new Date());
 
-        String procinstId = procinstService.addProcinst(customerDiningRecord.getId(),null,"接待进餐",formId,personPopedom,null);
-
-        customerDiningRecord.setProcinstId(procinstId);
-        insert(customerDiningRecord);
-
-
-        ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
-
-        if (procinstActivity != null) {
-            List<ProcinstActUser> procinstActUserList = procinstActUserService.findByProcinstActivityIdActionType(procinstActivity.getId(), "0", "1");
-            if (procinstActUserList.size() > 0) {
-                for (ProcinstActUser procinstActUser : procinstActUserList) {
-
-                    try{
-                        PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
+        if(StringUtils.isNotEmpty(ids)){
+            update(customerDiningRecord);
+        }else {
+            insert(customerDiningRecord);
+        }
 
-                        if (StringUtils.isNotBlank(personInfo.getOpenId())){
-                            //提交人
-                            PersonInfo personInfo1 = personInfoService.get(personPopedom.getPersonId());
-                            String accessToken = JwtUtil2.createToken(jwtSecret, personInfo.getId() + "", DateTime.now().plusHours(30 * 24).toDate());
-                            new Thread(() -> {
-                                WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的接待进餐信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + customerDiningRecord.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId +"&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
-                            }).start();
+        if (draft == "1") {
+            String procinstId = procinstService.addProcinst(customerDiningRecord.getId(), null, "接待进餐", formId, personPopedom, null);
+
+            customerDiningRecord.setProcinstId(procinstId);
+            update(customerDiningRecord);
+            customerDiningRecord.setStatus("0");
+
+            ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
+
+            if (procinstActivity != null) {
+                List<ProcinstActUser> procinstActUserList = procinstActUserService.findByProcinstActivityIdActionType(procinstActivity.getId(), "0", "1");
+                if (procinstActUserList.size() > 0) {
+                    for (ProcinstActUser procinstActUser : procinstActUserList) {
+
+                        try {
+                            PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
+
+                            if (StringUtils.isNotBlank(personInfo.getOpenId())) {
+                                //提交人
+                                PersonInfo personInfo1 = personInfoService.get(personPopedom.getPersonId());
+                                String accessToken = JwtUtil2.createToken(jwtSecret, personInfo.getId() + "", DateTime.now().plusHours(30 * 24).toDate());
+                                new Thread(() -> {
+                                    WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的接待进餐信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + customerDiningRecord.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId + "&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
+                                }).start();
+                            }
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
                         }
-                    }catch (Exception ex){
-                        ex.printStackTrace();
-                    }
 
+                    }
                 }
             }
-        }
 
+        }
 
 
         return customerDiningRecord.getId();

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

@@ -22,7 +22,7 @@ public interface AdjustShiftService {
     List<AdjustShift> list();
     Page<AdjustShift> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 
-    String adjustShiftSubmit(PersonPopedom personPopedom, String date, String shiftIds, String remark, String formId) throws Exception;
+    String adjustShiftSubmit(PersonPopedom personPopedom, String date, String shiftIds, String remark, String formId,String ids,String draft) throws Exception;
     List<AdjustShift> findBySchedulingIdAndStatus(String schedulingId,String status);
 
     String arrangeShiftSubmit(PersonPopedom personPopedom, String personIds, String date, String shiftIds, String remark);

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

@@ -18,6 +18,6 @@ public interface CarryThingsOutFactoryService {
 	int getAppointmentPassNum(Map<String, Object> searchParams);
 	Page<CarryThingsOutFactory> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 
-    String submitCarryThings(PersonPopedom personPopedom, String date, String images, String content, String formId) throws Exception;
+    String submitCarryThings(PersonPopedom personPopedom, String date, String images, String content, String formId,String ids,String draft) throws Exception;
 	Page<CarryThingsOutFactory> guardSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

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

@@ -139,7 +139,7 @@ public class AdjustShiftServiceImpl implements AdjustShiftService {
     }
 
     @Override
-    public String adjustShiftSubmit(PersonPopedom personPopedom, String date, String shiftIds, String remark, String formId) throws Exception {
+    public String adjustShiftSubmit(PersonPopedom personPopedom, String date, String shiftIds, String remark, String formId,String ids,String draft) throws Exception {
 
 
             Date dateTime = DateUtil.parse(date, "yyyy-MM-dd HH:mm:ss");
@@ -184,7 +184,7 @@ public class AdjustShiftServiceImpl implements AdjustShiftService {
             //   adjustShift.setOldShiftId(workPersonScheduling.getShiftIds());
             adjustShift.setRemark(remark);
             adjustShift.setType("1");
-            adjustShift.setStatus("0");
+            adjustShift.setStatus("-99");
             adjustShift.setSubmitTime(new Date());
             adjustShift.setCreateTime(new Date());
 
@@ -199,18 +199,24 @@ public class AdjustShiftServiceImpl implements AdjustShiftService {
             adjustShiftPerson.setOldShiftId(workPersonScheduling.getShiftIds());
             adjustShiftPerson.setCreateTime(new Date());
 
+            if(StringUtils.isNotEmpty(ids)){
+                update(adjustShift);
+            }else {
+                insert(adjustShift);
+            }
 
 
-       // String procinstId = ((ProcinstService)AopContext.currentProxy()).addProcinst(adjustShift.getId(),"调班",formId,personPopedom);
-
-            String procinstId =  procinstService.addProcinst(adjustShift.getId(),null,"调班",formId,personPopedom,null);
 
+            if (draft == "1") {
+                // String procinstId = ((ProcinstService)AopContext.currentProxy()).addProcinst(adjustShift.getId(),"调班",formId,personPopedom);
 
-            adjustShift.setProcinstId(procinstId);
-            insert(adjustShift);
-            adjustShiftPersonService.insert(adjustShiftPerson);
+                String procinstId = procinstService.addProcinst(adjustShift.getId(), null, "调班", formId, personPopedom, null);
 
 
+                adjustShift.setProcinstId(procinstId);
+                update(adjustShift);
+                adjustShiftPersonService.insert(adjustShiftPerson);
+                adjustShift.setStatus("0");
 
 
                 ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
@@ -220,18 +226,18 @@ public class AdjustShiftServiceImpl implements AdjustShiftService {
                     if (procinstActUserList.size() > 0) {
                         for (ProcinstActUser procinstActUser : procinstActUserList) {
 
-                            try{
+                            try {
                                 PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
 
-                                if (StringUtils.isNotBlank(personInfo.getOpenId())){
+                                if (StringUtils.isNotBlank(personInfo.getOpenId())) {
                                     //提交人
                                     PersonInfo personInfo1 = personInfoService.get(personPopedom.getPersonId());
                                     String accessToken = JwtUtil2.createToken(jwtSecret, personInfo.getId() + "", DateTime.now().plusHours(30 * 24).toDate());
                                     new Thread(() -> {
-                                        WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的调班信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + adjustShift.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId +"&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
+                                        WechatMessageUtil.sendEvenMessage(personInfo.getOpenId(), "有一条新的调班信息待审核", personInfo1.getName(), com.jpsoft.shinestar.modules.common.utils.StringUtils.getApprovalNo(), "前往处理", wxConfig.getPortalUrl() + "xsy/approval/infosp?id=" + adjustShift.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId + "&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
                                     }).start();
                                 }
-                            }catch (Exception ex){
+                            } catch (Exception ex) {
                                 ex.printStackTrace();
                             }
 
@@ -240,6 +246,7 @@ public class AdjustShiftServiceImpl implements AdjustShiftService {
                 }
 
 
+            }
 
 
             return adjustShift.getId();

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

@@ -18,6 +18,7 @@ import com.jpsoft.shinestar.modules.workflow.entity.ProcinstActivity;
 import com.jpsoft.shinestar.modules.workflow.service.ProcinstActUserService;
 import com.jpsoft.shinestar.modules.workflow.service.ProcinstActivityService;
 import com.jpsoft.shinestar.modules.workflow.service.ProcinstService;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -109,7 +110,7 @@ public class CarryThingsOutFactoryServiceImpl implements CarryThingsOutFactorySe
 	}
 
 	@Override
-	public String submitCarryThings(PersonPopedom personPopedom, String date, String images, String content, String formId) throws Exception {
+	public String submitCarryThings(PersonPopedom personPopedom, String date, String images, String content, String formId,String ids,String draft) throws Exception {
 
 
 		CarryThingsOutFactory carryThingsOutFactory = new CarryThingsOutFactory();
@@ -118,38 +119,43 @@ public class CarryThingsOutFactoryServiceImpl implements CarryThingsOutFactorySe
 		carryThingsOutFactory.setLeaveFactoryTime(DateUtil.parse(date));
 		carryThingsOutFactory.setLeaveFactoryReason(content);
 		carryThingsOutFactory.setImage(images);
-		carryThingsOutFactory.setAuditStatus("0");
+		carryThingsOutFactory.setAuditStatus("-99");
 		carryThingsOutFactory.setCreateTime(new Date());
 
+		if(StringUtils.isNotEmpty(ids)){
+			update(carryThingsOutFactory);
+		}else {
+			insert(carryThingsOutFactory);
+		}
 
-		String procinstId  = procinstService.addProcinst(carryThingsOutFactory.getId(),null,"携物出厂",formId,personPopedom,null);
+		if (draft == "1") {
+			String procinstId = procinstService.addProcinst(carryThingsOutFactory.getId(), null, "携物出厂", formId, personPopedom, null);
 
-		carryThingsOutFactory.setProcinstId(procinstId);
-		insert(carryThingsOutFactory);
+			carryThingsOutFactory.setProcinstId(procinstId);
+			update(carryThingsOutFactory);
+			carryThingsOutFactory.setAuditStatus("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) {
-						PersonInfo personInfo = personInfoService.get(Long.parseLong(procinstActUser.getUserId()));
+					new Thread(() -> {
+						for (ProcinstActUser procinstActUser : procinstActUserList) {
+							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=" + carryThingsOutFactory.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId+"&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
-					}
-				}).start();
+							//提交人
+							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=" + carryThingsOutFactory.getId() + "&procinstActUserId=" + procinstActUser.getId() + "&formId=" + formId + "&token=" + accessToken, wxConfig.getAppId(), wxConfig.getAppSecret());
+						}
+					}).start();
+				}
 			}
 		}
 		return carryThingsOutFactory.getId();
 
-
-
-
 	}
 
 	@Override

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

@@ -355,9 +355,10 @@ public class AdjustShiftApiController {
             @ApiImplicitParam(name = "date", value = "查询的日期", required = true, paramType = "form"),
             @ApiImplicitParam(name = "shiftIds", value = "班次ids", required = true, paramType = "form"),
             @ApiImplicitParam(name = "remark", value = "备注", required = true, paramType = "form"),
-            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form")
+            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "draft", value = "状态（0：草稿，1：提交）", required = true, paramType = "form")
     })
-    public MessageResult<Map> adjustShiftSubmit(String date, String shiftIds, String remark, String formId, String token, @RequestAttribute String subject) {
+    public MessageResult<Map> adjustShiftSubmit(String ids,String draft,String date, String shiftIds, String remark, String formId, String token, @RequestAttribute String subject) {
 
 
         MessageResult<Map> messageResult = new MessageResult<>();
@@ -367,7 +368,7 @@ public class AdjustShiftApiController {
             PersonPopedom personPopedom = personPopedomService.get(person.getPopedom());
 
 
-            String id = adjustShiftService.adjustShiftSubmit(personPopedom, date, shiftIds, remark, formId);
+            String id = adjustShiftService.adjustShiftSubmit(personPopedom, date, shiftIds, remark, formId,ids,draft);
 
             Map<String, Object> map = new HashMap<>();
             map.put("id", id);

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

@@ -141,9 +141,10 @@ public class CarryThingsOutFactoryApiController {
             @ApiImplicitParam(name = "date", value = "出厂日期", required = true, paramType = "form"),
             @ApiImplicitParam(name = "content", value = "申请理由物品清单", required = true, paramType = "form"),
             @ApiImplicitParam(name = "images", value = "图片", required = true, paramType = "form"),
-            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form")
+            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "draft", value = "状态（0：草稿，1：提交）", required = true, paramType = "form")
     })
-    public MessageResult<Map> submitCarryThings(String date, String content, String images,String formId,@RequestAttribute String subject, String token) {
+    public MessageResult<Map> submitCarryThings(String ids,String draft,String date, String content, String images,String formId,@RequestAttribute String subject, String token) {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
@@ -158,7 +159,7 @@ public class CarryThingsOutFactoryApiController {
 
 
 
-            String id = carryThingsOutFactoryService.submitCarryThings(personPopedom,date,images,content,formId);
+            String id = carryThingsOutFactoryService.submitCarryThings(personPopedom,date,images,content,formId,ids,draft);
 
 
             Map<String, Object> map = new HashMap<>();

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

@@ -60,9 +60,10 @@ public class CustomerDiningApiController {
             @ApiImplicitParam(name = "diningTime", value = "进餐时间", required = true, paramType = "form"),
             @ApiImplicitParam(name = "diningName", value = "用餐安排（午餐，晚餐，宵夜）", required = true, paramType = "form"),
             @ApiImplicitParam(name = "diningFee", value = "用餐标准金额", required = true, paramType = "form"),
-            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form")
+            @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "draft", value = "状态（0：草稿，1：提交）", required = true, paramType = "form")
     })
-    public MessageResult<Map> customerDiningSubmit(String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime,String diningName,String diningFee,String formId,String token, @RequestAttribute String subject) {
+    public MessageResult<Map> customerDiningSubmit(String ids,String draft,String customerCompany, String reason, Integer customerNum, Integer accompanyNum, String diningTime,String diningName,String diningFee,String formId,String token, @RequestAttribute String subject) {
 
 
         MessageResult<Map> messageResult = new MessageResult<>();
@@ -72,7 +73,7 @@ public class CustomerDiningApiController {
             PersonPopedom personPopedom = personPopedomService.get(person.getPopedom());
 
 
-            String id = customerDiningRecordService.customerDiningSubmit(personPopedom, customerCompany, reason,customerNum,accompanyNum,diningTime,diningName,diningFee,formId);
+            String id = customerDiningRecordService.customerDiningSubmit(personPopedom, customerCompany, reason,customerNum,accompanyNum,diningTime,diningName,diningFee,formId,ids,draft);
 
             Map<String, Object> map = new HashMap<>();
             map.put("id", id);