Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java

project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java

@@ -21,8 +21,8 @@ import java.util.Objects;
  * @date 2023/10/24
  * @date 2023/10/24
  */
  */
 @RestController
 @RestController
-@RequestMapping("/pea-order/msg")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
+@RequestMapping("/pea-order")
 public class MsgController {
 public class MsgController {
 
 
     private final  MsgService msgService;
     private final  MsgService msgService;
@@ -36,7 +36,7 @@ public class MsgController {
      * @author RenPing
      * @author RenPing
      * @date 2023/10/24
      * @date 2023/10/24
      */
      */
-    @GetMapping("/list")
+    @GetMapping("/msg/list")
     public Result<PageResult<MsgGroupResp>> list(@RequestHeader(name = "userId", required = true) String userId,
     public Result<PageResult<MsgGroupResp>> list(@RequestHeader(name = "userId", required = true) String userId,
                                                  MsgDTO.Request request) {
                                                  MsgDTO.Request request) {
         CommonUtil.setNullValue(request);
         CommonUtil.setNullValue(request);
@@ -63,7 +63,7 @@ public class MsgController {
      * @author RenPing
      * @author RenPing
      * @date 2023/10/24
      * @date 2023/10/24
      */
      */
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/msg/delete", method = RequestMethod.POST)
     public Result<Boolean> delete(@RequestHeader(name = "userId", required = true) String userId, @RequestBody @Valid MsgDTO.DeleteDto deleteDto) {
     public Result<Boolean> delete(@RequestHeader(name = "userId", required = true) String userId, @RequestBody @Valid MsgDTO.DeleteDto deleteDto) {
         AssertUtil.isNotEmpty(userId, "用户ID不能为空");
         AssertUtil.isNotEmpty(userId, "用户ID不能为空");
         msgService.delete(deleteDto.getId(), userId);
         msgService.delete(deleteDto.getId(), userId);

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomizeEntity.java

@@ -27,7 +27,7 @@ public class MapLayerCustomizeEntity {
     @Column(name = "layer", nullable = false, length = 50)
     @Column(name = "layer", nullable = false, length = 50)
     private String layer;
     private String layer;
 
 
-    @Column(name = "layer_describe", nullable = false, length = 200)
+    @Column(name = "layer_describe", length = 200)
     private String layerDescribe;
     private String layerDescribe;
 
 
     @Column(name = "status", nullable = false)
     @Column(name = "status", nullable = false)

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -124,10 +124,13 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
             record.setDescription(o.getDescription());
             record.setDescription(o.getDescription());
             record.setPriority(o.getPriority());
             record.setPriority(o.getPriority());
             record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
             record.setOrgBranchName(branchNames.getOrDefault(o.getOrgBranchId(), ""));
-            // 获取工程师信息
+            
+            // 获取工程师信息，为派工为空
+            if(StringUtils.isNotBlank(o.getEngineerCode())) {
             	List<String> names = this.getOrderEngineerNames(o.getEngineerCode(), o.getEngineerCodeSub(), engineerNames);
             	List<String> names = this.getOrderEngineerNames(o.getEngineerCode(), o.getEngineerCodeSub(), engineerNames);
             	record.setEngineerNum(names.size()); //工程师数量
             	record.setEngineerNum(names.size()); //工程师数量
             	record.setEngineerNames(String.join("、", names)); //工程师姓名列表
             	record.setEngineerNames(String.join("、", names)); //工程师姓名列表
+            }
 
 
             record.setExpectTimeBegin(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin()));
             record.setExpectTimeBegin(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin()));
             record.setExpectTimeEnd(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeEnd()));
             record.setExpectTimeEnd(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeEnd()));