巡检相关接口

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -103,6 +103,9 @@ public class MaintenanceController extends BladeController {
 		if (Func.isNotEmpty(task.getPlanId())) {
 			wrapper.eq(MaintenanceTask::getPlanId, task.getPlanId());
 		}
+		if (Func.isNotEmpty(task.getStatusSearch())) {
+			wrapper.in(MaintenanceTask::getTaskStatus, task.getStatusSearch().split(","));
+		}
 
 		IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper);
 		return R.data(pages);
@@ -215,13 +218,16 @@ public class MaintenanceController extends BladeController {
 		if (Func.isNotEmpty(task.getDeptName())) {
 			wrapper.eq(MaintenanceTask::getDeptName, task.getDeptName());
 		}
+		if (Func.isNotEmpty(task.getStatusSearch())) {
+			wrapper.in(MaintenanceTask::getRepairStatus, task.getStatusSearch().split(","));
+		}
 
 		IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper);
 		return R.data(pages);
 	}
 
 	@GetMapping("/repair-detail")
-	@Operation(summary = "任务明细", description = "任务明细")
+	@Operation(summary = "维修详细", description = "维修详细")
 	public R repairDetail(@RequestParam Long id) {
 		MaintenanceTask task = taskService.repairDetail(id);
 		return R.data(task);
@@ -319,6 +325,12 @@ public class MaintenanceController extends BladeController {
 	@Operation(summary = "客户确认维修完成", description = "客户确认维修完成")
 	public R repairCustomerConfirmFinish(@RequestBody MaintenanceTask task) {
 		MaintenanceTask taskOld = taskService.getById(task.getId());
+		taskOld.setSignaturePerson(task.getSignaturePerson());
+		taskOld.setSignatureUrl(task.getSignatureUrl());
+		taskOld.setSignatureTime(task.getSignatureTime());
+		taskOld.setIsOkSecure(task.getIsOkSecure());
+		taskOld.setIsOkValidity(task.getIsOkValidity());
+		taskOld.setIsOkQuality(task.getIsOkQuality());
 		taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_EVALUATE_FINISH.getValue());
 		taskService.updateById(taskOld);
 
@@ -326,9 +338,14 @@ public class MaintenanceController extends BladeController {
 	}
 
 	@PostMapping("/repair-customer-refuse-finish")
-	@Operation(summary = "客户确认维修完成", description = "客户确认维修完成")
+	@Operation(summary = "客户确认维修未完成", description = "客户确认维修未完成")
 	public R repairCustomerRefuseFinish(@RequestBody MaintenanceTask task) {
 		MaintenanceTask taskOld = taskService.getById(task.getId());
+		taskOld.setApprovePoint("客户确认维修完成");
+		taskOld.setApprovePerson(task.getApprovePerson());
+		taskOld.setApproveResult(CommonConstant.FALSE_INT);
+		taskOld.setApproveTime(DateUtil.now());
+		taskOld.setApproveRemark(task.getApproveRemark());
 		taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_CUSTOMER_CONFIRM.getValue());
 		taskService.updateById(taskOld);
 

src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java

@@ -10,7 +10,6 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.modules.business.pojo.entity.Device;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
-import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
 import org.springblade.modules.business.pojo.entity.workorder.WorkOrder;
 import org.springblade.modules.business.pojo.vo.MaintenanceTaskVO;
 import org.springblade.modules.business.service.IDeviceService;
@@ -19,6 +18,7 @@ import org.springblade.modules.business.service.IMaintenanceTaskService;
 import org.springblade.modules.business.service.IWorkOrderService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
@@ -102,7 +102,7 @@ public class WorkBenchesController extends BladeController {
      * 维修统计
      */
     @GetMapping("/upkeepStat")
-    public R<Map<String, Object>> upkeepStat(String startTime, String endTime) throws ParseException {
+    public R<Map<String, Object>> upkeepStat(@RequestParam String startTime, @RequestParam String endTime) throws ParseException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Map<String, Object> map = new HashMap<>();
         List<String> xData = new ArrayList<>();

src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java

@@ -31,6 +31,7 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -397,10 +398,15 @@ public class WorkOrderController extends BladeController {
 	 */
 	@ApiLog(value = "提报管理-已开发票")
 	@PostMapping("/service-invoice")
-	public R serviceInvoice(@RequestBody WorkOrder workOrder) {
+	public R serviceInvoice(@RequestBody List<WorkOrder> orderList) {
+		List<WorkOrder> orderOldList = new ArrayList<>();
+		for (WorkOrder workOrder : orderList) {
 			WorkOrder workOrderOld = workOrderService.getById(workOrder.getId());
 			workOrderOld.setStatus(WorkOrderStatusEnum.TICKET.getValue());
-		workOrderService.updateById(workOrderOld);
+			orderOldList.add(workOrderOld);
+		}
+
+		workOrderService.updateBatchById(orderOldList);
 
 		return R.success("");
 	}

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java

@@ -83,6 +83,12 @@ public class MaintenanceTask extends BaseEntity {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date reservationTime;
 
+	/**
+	 * 附件详情
+	 */
+	@TableField(exist = false)
+	private String statusSearch;
+
 	/**
 	 * 任务状态
 	 */
@@ -131,6 +137,36 @@ public class MaintenanceTask extends BaseEntity {
 	@TableField(exist = false)
 	private List<DeviceAttach> attaches;
 
+	/**
+	 * 评价质量是否满意(0否 1是)
+	 */
+	private Integer isOkQuality;
+
+	/**
+	 * 评价安全是否满意(0否 1是)
+	 */
+	private Integer isOkSecure;
+
+	/**
+	 * 评价时效是否满意(0否 1是)
+	 */
+	private Integer isOkValidity;
+
+	/**
+	 * 签名图片地址
+	 */
+	private String signatureUrl;
+
+	/**
+	 * 签名人
+	 */
+	private String signaturePerson;
+
+	/**
+	 * 签名时间
+	 */
+	private Date signatureTime;
+
 	/**
 	 * 计划详情
 	 */

src/main/resources/application-dev.yml

@@ -11,7 +11,8 @@ spring:
         enabled: false
   datasource:
     # MySql
-    url: jdbc:mysql://127.0.0.1:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.1.12:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://127.0.0.1:3306/lab-ops?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
     password: 123456