|
|
@ -13,6 +13,7 @@ import com.zdxt.code.domain.LinkageDict; |
|
|
import com.zdxt.code.service.IEnterpriseComplaintService; |
|
|
import com.zdxt.code.service.IEnterpriseComplaintService; |
|
|
import com.zdxt.code.service.IEnterpriseLawEnforcementService; |
|
|
import com.zdxt.code.service.IEnterpriseLawEnforcementService; |
|
|
import com.zdxt.code.service.ILinkageDictService; |
|
|
import com.zdxt.code.service.ILinkageDictService; |
|
|
|
|
|
import com.zdxt.code.utils.ZwSmsClient; |
|
|
import com.zdxt.common.ZDResponse; |
|
|
import com.zdxt.common.ZDResponse; |
|
|
import com.zdxt.common.controller.BaseController; |
|
|
import com.zdxt.common.controller.BaseController; |
|
|
import com.zdxt.common.util.StringUtils; |
|
|
import com.zdxt.common.util.StringUtils; |
|
|
@ -43,6 +44,9 @@ public class AppEnterpriseLawEnforcementController extends BaseController |
|
|
@Autowired private ILinkageDictService iLinkageDictService; |
|
|
@Autowired private ILinkageDictService iLinkageDictService; |
|
|
@Autowired private IEnterpriseComplaintService enterpriseComplaintService; |
|
|
@Autowired private IEnterpriseComplaintService enterpriseComplaintService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ZwSmsClient zwSmsClient; |
|
|
|
|
|
|
|
|
@RequiresPermissions("code:enforcement:view") |
|
|
@RequiresPermissions("code:enforcement:view") |
|
|
@GetMapping() |
|
|
@GetMapping() |
|
|
public String enforcement() |
|
|
public String enforcement() |
|
|
@ -105,6 +109,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController |
|
|
public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) |
|
|
public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) |
|
|
{ |
|
|
{ |
|
|
List<DeptBean> deptObjs = enterpriseLawEnforcement.getDeptObjs(); |
|
|
List<DeptBean> deptObjs = enterpriseLawEnforcement.getDeptObjs(); |
|
|
|
|
|
// 工单保存时不生产副工单, 导致关联部门无法存储, 因此这里手动塞入临时字段
|
|
|
Map<String, String> tmpDetpJson = new HashedMap(); |
|
|
Map<String, String> tmpDetpJson = new HashedMap(); |
|
|
for (DeptBean bean : deptObjs) { |
|
|
for (DeptBean bean : deptObjs) { |
|
|
tmpDetpJson.put(bean.getDeptId(), bean.getDeptName()); |
|
|
tmpDetpJson.put(bean.getDeptId(), bean.getDeptName()); |
|
|
@ -177,7 +182,9 @@ public class AppEnterpriseLawEnforcementController extends BaseController |
|
|
// }
|
|
|
// }
|
|
|
|
|
|
|
|
|
enterpriseLawEnforcement.setIsSubmit(1); |
|
|
enterpriseLawEnforcement.setIsSubmit(1); |
|
|
|
|
|
// 用于区分联合工单的主副单的区别
|
|
|
enterpriseLawEnforcement.setMainDeputyOrder(1); |
|
|
enterpriseLawEnforcement.setMainDeputyOrder(1); |
|
|
|
|
|
// 统一联合工单号. 用去区分是否为同一工单用, 回显的是用到
|
|
|
enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); |
|
|
enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); |
|
|
enterpriseLawEnforcement.setTmpDeptJson(null); |
|
|
enterpriseLawEnforcement.setTmpDeptJson(null); |
|
|
// 先单独处理主单
|
|
|
// 先单独处理主单
|
|
|
@ -209,9 +216,21 @@ public class AppEnterpriseLawEnforcementController extends BaseController |
|
|
// } else {
|
|
|
// } else {
|
|
|
// resNum = enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
|
|
|
// resNum = enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
// 下发短信
|
|
|
|
|
|
try { |
|
|
|
|
|
zwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),"您有一条执法预约信息, 请查收"); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
System.out.println("短信下发异常"); |
|
|
|
|
|
e.printStackTrace(); |
|
|
|
|
|
} |
|
|
return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); |
|
|
return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 联合执法副单提交时执行 |
|
|
|
|
|
* @param enterpriseLawEnforcement |
|
|
|
|
|
* @return |
|
|
|
|
|
*/ |
|
|
@PostMapping("/editDeputyOrder") |
|
|
@PostMapping("/editDeputyOrder") |
|
|
@ResponseBody |
|
|
@ResponseBody |
|
|
public ZDResponse editSaveDeputyOrder(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { |
|
|
public ZDResponse editSaveDeputyOrder(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { |
|
|
@ -271,6 +290,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController |
|
|
{ |
|
|
{ |
|
|
EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); |
|
|
EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); |
|
|
List<DeptBean> objs = new ArrayList<>(); |
|
|
List<DeptBean> objs = new ArrayList<>(); |
|
|
|
|
|
// 联合工单第一次保存时, 因为不生产副工单, 因此回显的时候无法通过 uniteCheck 获取到关联的副单, 因此从临时的字段获取
|
|
|
if (StringUtils.isNotEmpty(enfrorcement.getUniteCheck())) { |
|
|
if (StringUtils.isNotEmpty(enfrorcement.getUniteCheck())) { |
|
|
EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); |
|
|
EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); |
|
|
tmpParams.setUniteCheck(enfrorcement.getUniteCheck()); |
|
|
tmpParams.setUniteCheck(enfrorcement.getUniteCheck()); |
|
|
|