|
|
@@ -12,19 +12,23 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import com.goafanti.admin.service.AdminService;
|
|
|
import com.goafanti.cognizance.bo.LatelyCogRecord;
|
|
|
import com.goafanti.cognizance.service.OrgCognizanceService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.enums.ContractFields;
|
|
|
+import com.goafanti.common.enums.ContractLogFields;
|
|
|
import com.goafanti.common.enums.OrgCognizanceStatus;
|
|
|
import com.goafanti.common.model.Contract;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.common.utils.TimeUtils;
|
|
|
+import com.goafanti.contract.bo.InputContactLog;
|
|
|
import com.goafanti.contract.bo.InputContract;
|
|
|
import com.goafanti.contract.bo.InputSaveContract;
|
|
|
+import com.goafanti.contract.service.ContractLogService;
|
|
|
import com.goafanti.contract.service.ContractService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
@@ -34,9 +38,23 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
@Resource
|
|
|
private ContractService contractService;
|
|
|
@Resource
|
|
|
+ private ContractLogService contractLogService;
|
|
|
+ @Resource
|
|
|
private UserService userService;
|
|
|
@Resource
|
|
|
private OrgCognizanceService orgCognizanceService;
|
|
|
+ @Resource
|
|
|
+ private AdminService adminService;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 合同分发流转人员下拉
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/principal", method = RequestMethod.GET)
|
|
|
+ public Result getPrincipal() {
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(adminService.selectContractManager());
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 合同列表
|
|
|
@@ -95,7 +113,7 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
* 新增--提交合同
|
|
|
*/
|
|
|
@RequestMapping(value = "/submit", method = RequestMethod.POST)
|
|
|
- public Result submitContract(@Valid InputContract ic, BindingResult bindingResult, String recordTimeFormattedDate,
|
|
|
+ public Result submitContract(@Valid InputContract ic, BindingResult bindingResult, String signDateFormattedDate,
|
|
|
@RequestParam(name = "principals[]", required = false) String[] principals) {
|
|
|
Result res = new Result();
|
|
|
if (principals.length < 1 || null == principals) {
|
|
|
@@ -103,7 +121,7 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (StringUtils.isBlank(recordTimeFormattedDate)) {
|
|
|
+ if (StringUtils.isBlank(signDateFormattedDate)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同签订时间", "合同签订时间"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -126,7 +144,53 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
|
|
|
Contract c = new Contract();
|
|
|
BeanUtils.copyProperties(ic, c);
|
|
|
- contractService.insertManageSubmit(c, principals);
|
|
|
+ contractService.insertManageSubmit(c, principals, signDateFormattedDate);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 合同详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/detail", method = RequestMethod.GET)
|
|
|
+ public Result detail(String id) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(contractService.selectContractDetail(id));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 流转分发
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/circulation", method = RequestMethod.POST)
|
|
|
+ public Result circulation(@Valid InputContactLog icl, BindingResult bindingResult,
|
|
|
+ @RequestParam(name = "principals[]", required = false) String[] principals) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ ContractLogFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (principals.length < 1 || null == principals) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转分发用户", "流转分发用户"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(icl.getCid())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == icl.getStatus()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同流转分发状态", "合同流转分发状态"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ contractLogService.insertCirculation(icl, principals);
|
|
|
return res;
|
|
|
}
|
|
|
|