Browse Source

添加协单助手开发

anderx 3 years ago
parent
commit
ce7a41032b

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -662,7 +662,7 @@
     a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
     a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
     date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
-    a.main_name mainName
+    a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName
     from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
     left join t_order_new d on a.order_no=d.order_no
     where 1=1

+ 5 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -339,7 +339,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 新增协单助手
+	 * 删除协单助手
 	 * @param id 公出编号
 	 * @param aid 协单助手编号
 	 * @return
@@ -351,6 +351,10 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(new Error(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号与人员编号"));
 			return res;
 		}
+		if (publicReleaseService.checkdeleteAssistant(id,aid)){
+			res.getError().add(new Error("协单助手已经打卡,无法删除"));
+			return res;
+		}
 		res.data(publicReleaseService.deleteAssistant(id,aid));
 		return res;
 	}

+ 1 - 0
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -56,4 +56,5 @@ public interface PublicReleaseService {
 
 	int deleteAssistant(Integer id, String aid);
 
+    boolean checkdeleteAssistant(Integer id, String aid);
 }

+ 14 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -789,6 +789,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return updateAssistant(p, said, sname);
 	}
 
+
+
 	private void deleteAssistantPulicRelease(PublicRelease p, String aid) {
 		publicReleaseMapper.updateStatusByMainId(3,4,p.getMainId(),aid);
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
@@ -798,5 +800,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		addWeChatNotice( aid,3,"撤销技术协助。",p.getId());
 	}
 
+	@Override
+	public boolean checkdeleteAssistant(Integer id, String aid) {
+		PublicRelease p = publicReleaseMapper.selectByPrimaryKey(id);
+		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
+		for (PublicRelease use : list) {
+			if (use.getClockIn()==1){
+				return true;
+			}
+		}
+		return false;
+	}
+
 
 }