2024 7 23 号

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDeviceInfoController.java

@@ -7,15 +7,13 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.business.dto.TrialDeviceOverhaulDTO;
 import org.springblade.business.dto.TrialDeviceUseDTO;
+import org.springblade.business.entity.TrialDeviceClassification;
 import org.springblade.business.entity.TrialDeviceOverhaul;
 import org.springblade.business.excel.*;
-import org.springblade.business.service.ITrialDeviceOverhaulService;
+import org.springblade.business.service.*;
 import org.springblade.business.vo.*;
 import org.springblade.business.entity.TrialDeviceInfo;
 import org.springblade.business.entity.TrialDeviceUse;
-import org.springblade.business.service.ITrialDeviceInfoService;
-import org.springblade.business.service.ITrialDeviceUseService;
-import org.springblade.business.service.ITrialSampleInfoService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -27,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +39,7 @@ public class TrialDeviceInfoController extends BladeController {
     private final ITrialDeviceInfoService iTrialDeviceInfoService;
     private final ITrialDeviceUseService iTrialDeviceUseService;
     private final ITrialDeviceOverhaulService iTrialDeviceOverhaulService;
+    private final ITrialDeviceClassificationService iTrialDeviceClassificationService;
 
     @PostMapping("/mobilization/submit")
     @ApiOperationSupport(order = 1)
@@ -79,8 +79,15 @@ public class TrialDeviceInfoController extends BladeController {
     @PostMapping("/mobilization/read-excel")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "进场设备读取excel数据", notes = "传入excel")
-    public R<List<TrialDeviceInfoExcel>> readExcel(MultipartFile file) {
+    public R<List<TrialDeviceInfoExcel>> readExcel(MultipartFile file,String classNameId) {
+
+        TrialDeviceClassification trialDeviceInfo = iTrialDeviceClassificationService.getById(Func.toLong(classNameId));
         List<TrialDeviceInfoExcel> list = ExcelUtil.read(file, TrialDeviceInfoExcel.class);
+        if(trialDeviceInfo!=null && Func.isNotEmpty(trialDeviceInfo) && list.size()>=1){
+            list.stream().forEach(TrialDeviceInfoExcel ->{
+                TrialDeviceInfoExcel.setDeviceClassName(trialDeviceInfo.getClassName());
+            });
+        }
         return R.data(list);
     }
 
@@ -155,6 +162,20 @@ public class TrialDeviceInfoController extends BladeController {
         return R.data(list);
     }
 
+
+    /**
+     * 导出模板
+     */
+    @GetMapping("/use/export-template")
+    @ApiOperationSupport(order = 24)
+    @ApiOperation(value = "导出模板")
+    public void exportUser(HttpServletResponse response) {
+        List<TrialDeviceUseExcel> list = new ArrayList<>();
+        ExcelUtil.export(response, "设备进程模板", "设备进程模板", list, TrialDeviceUseExcel.class);
+    }
+
+
+
     @PostMapping("/use/import-batch")
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "使用设备导入数据保存", notes = "传入TrialDeviceUseExcelDTO")

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -100,8 +100,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class EVisaServiceImpl implements EVisaService {
 
-    private static final String SIGN_HOST = "172.30.224.79";
-   // private static final String SIGN_HOST = "47.115.117.246";
+   // private static final String SIGN_HOST = "172.30.224.79";
+    private static final String SIGN_HOST = "47.115.117.246";
 
     private static final String SIGN_PORT = "8183";
 

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -1427,7 +1427,7 @@ public class FormulaUtils {
 
         return chart;
     }
-    public static void main(String[] args) throws IOException {
+    public static void main22(String[] args) throws IOException {
         double[] actualProgress = {10, 15, 18, 27, 35, 48};
         double[] plannedProgress = {10, 15, 20, 25, 30, 35};
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -473,6 +473,16 @@ public class TextdictInfoController extends BladeController {
             textdictInfo.setSigRoleName(jsonObject.getString("sigRoleName"));
             textdictInfo.setPyzbx(jsonObject.getDouble("pyzbx"));
             textdictInfo.setPyzby(jsonObject.getDouble("pyzby"));
+            Integer timeState = jsonObject.getInteger("timeState");
+            textdictInfo.setTimeState(timeState);
+            if(timeState!=null && timeState==1){
+                textdictInfo.setTimeColKey(jsonObject.getString("timeColKey"));
+                textdictInfo.setTimeName(jsonObject.getString("timeName"));
+            }else{
+                textdictInfo.setTimeColKey("");
+                textdictInfo.setTimeName("");
+            }
+
             textdictInfo.setProjectId(wbsTreePrivate.getProjectId());
 
             //由于使用联合主键

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -821,7 +821,7 @@
     </select>
 
     <select id="apiTreeNode" resultMap="apiTreeNodeResultMap">
-        select distinct p_key_id ,type, CONCAT(SUBSTR(id, 2, LENGTH(id) - 5), SUBSTR(p_key_id, -5, 5)) as id ,CONCAT(SUBSTR(parent_id, 2, LENGTH(parent_id) - 5), SUBSTR(p_key_id, -5, 5)) as parent_id , node_name
+        select distinct p_key_id ,type, id , parent_id , node_name
         from m_wbs_tree_contract
         where
         is_deleted = 0

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3657,6 +3657,7 @@ public class TaskController extends BladeController {
                                 rs.setTitle(sheet, title);
                                 /*添加电签*/
                                 setDQInfo(sheet, rs, title);
+
                                 /*合并单元格*/
                                 if (mergeConfig.containsKey(n)) {
                                     mergeConfig.get(n).forEach(ca -> {