在建

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -411,7 +411,7 @@ public interface SubInfoService {
 
 	void updateFixeCat(String subInfoId, String cat);
 
-	boolean rg(MoveDbParamVo vo);
+	boolean rg(MoveDbParamVo vo,LoginUserVO userVO);
 
 	List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -4894,7 +4894,19 @@ public class SubInfoServiceImpl implements SubInfoService {
         return subInfo;
     }
     @Override
-    public boolean rg(MoveDbParamVo vo){
+    public boolean rg(MoveDbParamVo vo,LoginUserVO userVO){
+        // 转库日志
+        SubInfo subinfo = subInfoDao.findById(vo.getId());
+        LogOperate logOperate = new LogOperate();
+        logOperate.setCreateUserId(userVO.getId());
+        logOperate.setCreateUserName(userVO.getLoginName());
+        logOperate.setStatusFirst(subinfo.getStatus());
+        logOperate.setSubId(vo.getId());
+        logOperate.setStatusAfter("r");
+        logOperate.setKind("1");
+        logOperate.setTitle("投产转入规");
+        logOperateService.save(logOperate);
+
         return subInfoDao.updateBySql(
                 "update sub_info set rg_date = ?,is_rg=1,last_update_time=now() where id = ?",
                 vo.getRgDate(),
@@ -5910,7 +5922,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
     @Override
     public boolean moveDb(MoveDbParamVo vo,LoginUserVO userVO) {
-        SubInfo subinfo = subInfoDao.findById(vo.getId());
+        SubInfoGxj subinfo = subInfoMapper.findById(vo.getId());
         if (vo.getStatus().equals(subinfo.getStatus())){
             return false;
         }
@@ -5928,9 +5940,16 @@ public class SubInfoServiceImpl implements SubInfoService {
             logOperate.setStatusFirst(subinfo.getStatus());
             logOperate.setSubId(vo.getId());
             logOperate.setKind(Integer.parseInt(vo.getStatus()) > Integer.parseInt(subinfo.getStatus()) ? "1" : "0");
-            logOperate.setTitle(String.format("%s转%s",SubInfoStatusEnum.getDesc(subinfo.getStatus()),SubInfoStatusEnum.getDesc(vo.getStatus())));
+            // 入规 转在建
+            String beforeStatusName = SubInfoStatusEnum.getDesc(subinfo.getStatus());
+            if (subinfo.getStatus().equals(SubInfoStatusEnum.TC.getCode()) && subinfo.getBoolRg()){
+                beforeStatusName = "入规";
+                logOperate.setStatusFirst("r");
+            }
+            logOperate.setTitle(String.format("%s转%s",beforeStatusName,SubInfoStatusEnum.getDesc(vo.getStatus())));
             logOperateService.save(logOperate);
             if (!SubInfoStatusEnum.CB.getCode().equals(vo.getStatus())){
+                // 移入新建、在建、投产库修改sub_info 对应字段日期
                 String sql = String.format("update sub_info set status='%s',last_update_time=now(),%s=now() where id='%s'", vo.getStatus(), map.get(vo.getStatus()), vo.getId());
                 int i = subInfoDao.updateBySql(sql);
                 return i > 0;

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -1541,15 +1541,17 @@ public class SubInfoExportController extends BaseController {
             if (SubInfoStatusEnum.ZJ.getCode().equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.TC.getCode().equals(logOperate.getStatusAfter())) {
                 ++vo.zjToTcNum;
             }
-            // if (SubInfoStatusEnum.TC.getCode().equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.RG.getCode().equals(logOperate.getStatusAfter())) {
-            //     ++vo.tcToRgNum;
-            // }
+            // 投产转入规
+            if (SubInfoStatusEnum.TC.getCode().equals(logOperate.getStatusFirst()) && "r".equals(logOperate.getStatusAfter())) {
+                ++vo.tcToRgNum;
+            }
             if (SubInfoStatusEnum.XJ.getCode().equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.CB.getCode().equals(logOperate.getStatusAfter())) {
                 ++vo.xjToCbNum;
             }
-            // if (SubInfoStatusEnum.RG.getCode().equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.ZJ.getCode().equals(logOperate.getStatusAfter())) {
-            //     ++vo.rgToZjNum;
-            // }
+            // 入规转在建
+            if ("r".equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.ZJ.getCode().equals(logOperate.getStatusAfter())) {
+                ++vo.rgToZjNum;
+            }
         }
     }
 
@@ -1747,8 +1749,12 @@ public class SubInfoExportController extends BaseController {
         try (OutputStream outputStream = response.getOutputStream()) {
             workbook.write(outputStream);
             workbook.close();
-        } catch (IOException e) {
-            e.printStackTrace();
+        }catch (IOException e) {
+            // 处理 IO 异常
+            handleErrorResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "导出 Excel 文件时出现错误：" + e.getMessage());
+        } catch (Exception e) {
+            // 处理其他异常
+            handleErrorResponse(response, HttpServletResponse.SC_BAD_REQUEST, "请求参数错误或发生其他错误：" + e.getMessage());
         }
     }
 
@@ -2538,10 +2544,14 @@ public class SubInfoExportController extends BaseController {
         }
     }
 
-    private void handleErrorResponse(HttpServletResponse response, int statusCode, String errorMessage) throws IOException {
+    private void handleErrorResponse(HttpServletResponse response, int statusCode, String errorMessage) {
         response.setStatus(statusCode);
         response.setContentType("text/plain;charset=UTF-8");
-        response.getWriter().write(errorMessage);
+        try {
+            response.getWriter().write(errorMessage);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     /**

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -1406,7 +1406,7 @@ public class SubInfoApiController extends BaseController {
         try {
             Assert.notBlank(vo.getId(), "项目ID不能为空");
             Assert.notNull(vo.getRgDate(), "入规日期不能为空");
-            boolean isSuccess = subInfoService.rg(vo);
+            boolean isSuccess = subInfoService.rg(vo, getCurUser().getLoginUser());
             message.add(isSuccess ? "移入成功" : "移入失败");
         } catch (Exception e) {
             logger.error("", e);

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -232,39 +232,39 @@
                             code: '303',
                             url: 'subject/subInfo/pre'/* ?type=qx */
                         },
+                    ]
+                },
+                {
+                    icon: 'icon_zjfwk_active',
+                    activeIcon: 'icon_zjfwk_active',
+                    txt: '智联工地',
+                    code: '7',
+                    child: [
                         {
-                            icon: 'icon_zjfwk_active',
-                            activeIcon: 'icon_zjfwk_active',
-                            txt: '智联工地',
-                            code: '7',
-                            child: [
-                                {
-                                    code: '702',
-                                    txt: '项目地图',
-                                    url: 'smart/query'
-                                    //url: 'register/underConstruction'
-                                },
-                                {
-                                    code: '703',
-                                    txt: '实时视频',
-                                    url: 'smart/vedio'
-                                    //url: 'register/underConstruction'
-                                },
-                                {
-                                    txt: '周调度图片',
-                                    code: '706',
-                                    url: 'graphicProgress/list'
-                                    // url: 'register/underConstruction'
-                                },
-                                {
-                                    txt: '月航拍全景',
-                                    code: '707',
-                                    url: 'aerial/list'
-                                    // url: 'register/underConstruction'
-                                }
-
-                            ]
+                            code: '702',
+                            txt: '项目地图',
+                            url: 'smart/query'
+                            //url: 'register/underConstruction'
                         },
+                        {
+                            code: '703',
+                            txt: '实时视频',
+                            url: 'smart/vedio'
+                            //url: 'register/underConstruction'
+                        },
+                        {
+                            txt: '周调度图片',
+                            code: '706',
+                            url: 'graphicProgress/list'
+                            // url: 'register/underConstruction'
+                        },
+                        {
+                            txt: '月航拍全景',
+                            code: '707',
+                            url: 'aerial/list'
+                            // url: 'register/underConstruction'
+                        }
+
                     ]
                 },
                 {

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -725,7 +725,8 @@
                 console.log('res.data: ', res.data)
                 hyData = res.data.map(item => ({
                     value: item.zb, // 使用 amt 作为 value
-                    name: item.title + (item.id ? '_' + item.id : ''), // 使用 title 作为 name
+                    name: item.title
+                        // + (item.id ? '_' + item.id : ''), // 使用 title 作为 name
                 }));
 
                 initHy();

projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -1119,6 +1119,7 @@
                         //首次不执行
                         if (!first) {
                             self.pageNo = obj.curr;
+                            self.getData();
                         }
                     }
                 });