bug和数据库修改

jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java

@@ -70,11 +70,11 @@ public class CommonController
                 StringBuilder desiredPath=new StringBuilder("/"+fileName);
                 String realFileName=fileName;
                 if (fileName.contains("/")) {
-                     realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+                     realFileName = fileName.split("/profile")[1];
 
-                String[] parts = fileName.split("/");
+                String[] parts = realFileName.split("/");
                  desiredPath = new StringBuilder("/");
-                for (int i = 2; i < parts.length; i++) {
+                for (int i = 1; i < parts.length; i++) {
                     desiredPath.append(parts[i]).append("/");
                 }
 

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java

@@ -26,5 +26,6 @@ public interface BsSgcJsjdBuiProgressMapper extends BaseMapper<BsSgcJsjdBuiProgr
                                             @Param("projectType") String projectType,
                                             @Param("adcd") String adcd,
                                             @Param("orderBy") String orderBy,
-                                            Page page);
+                                            Page page,
+                                            @Param("isMajor")String isMajor);
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiContInfoService.java

@@ -16,6 +16,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 
 /**
@@ -57,6 +58,7 @@ public class BsSgcJsjdBuiContInfoService extends BaseService<BsSgcJsjdBuiContInf
                     Date startYear = bsSgcJsjdBuiPurposeFund.getStartYear();
                     Date endYear = bsSgcJsjdBuiPurposeFund.getEndYear();
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
                     String format = simpleDateFormat.format(startYear);
                     String format1 = simpleDateFormat.format(endYear);
                     ArrayList<String> list = new ArrayList<>();

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java

@@ -1,5 +1,6 @@
 package com.kms.build.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
@@ -45,11 +46,23 @@ public class BsSgcJsjdBuiProgressService extends BaseService<BsSgcJsjdBuiProgres
         BsSgcJsjdBuiProgress data = sp.getData();
 
         assert sysUser != null;
+        String isMajor = null;
+
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor = split[0];
+            if (" ".equals(split[1])) {
+                projectType = null;
+            } else {
+                projectType = split[1];
+            }
+        }
 
         IPage<BsSgcJsjdBuiProgress> list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
-                data.getProjectType(),
+                projectType,
                 sysXzqhService.getSubString(xzqhId),
-                "create_time",new Page<>(sp.getPageNum(), sp.getPageSize()));
+                "create_time",new Page<>(sp.getPageNum(), sp.getPageSize()),isMajor);
         return list;
     }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -250,7 +250,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
-        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, data.getProjectType(),
+        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
                 sysXzqhService.getSubString(xzqhId),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 

jwtech-system/src/main/java/com/kms/build/service/FileService.java

@@ -31,14 +31,22 @@ public class FileService extends BaseService<FileMapper, FileDto> {
     public List<FileResponseDto> fileList(String proNo, String proCode) {
 
         FileDto fileDto=fileMapper.fileList(proNo, proCode);
-
         List<FileResponseDto> fileResponseDtos = handleFileList(fileDto);
 
-
+       for (int i=1;i<=fileResponseDtos.size();i++){
-        return fileResponseDtos;
+           String num="";
-
+           if (i<10){
-
+               num=proCode+"-00"+i;
-
+           }
+          else  if (i<100){
+               num=proCode+"-0"+i;
+           }
+          else {
+              num=proCode+"-"+i;
+           }
+           fileResponseDtos.get(i-1).setFileNo(num);
+       }
+       return fileResponseDtos;
     }
 
 

jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiRectificationController.java

@@ -9,6 +9,8 @@ import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
 
+import com.kms.warn.domain.BsSgcJsjdWarnResultHandle;
+import com.kms.warn.service.BsSgcJsjdWarnResultHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +46,8 @@ public class BsSgcJsjdBuiRectificationController extends BaseController
 {
     @Autowired
     private BsSgcJsjdBuiRectificationService bsSgcJsjdBuiRectificationService;
-
+    @Autowired
+    private BsSgcJsjdWarnResultHandleService resultHandleService;
     /**
      * 查询整改通知书列表
      */
@@ -87,6 +90,7 @@ public class BsSgcJsjdBuiRectificationController extends BaseController
     public AjaxResult add(@RequestBody BsSgcJsjdBuiRectification bsSgcJsjdBuiRectification)
     {
         BaseEntityUtils.preInsert(bsSgcJsjdBuiRectification);
+
         return toAjax(bsSgcJsjdBuiRectificationService.save(bsSgcJsjdBuiRectification));
     }
 

jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java

@@ -99,6 +99,7 @@ public class BsSgcJsjdWarnResultHandleController extends BaseController
     public AjaxResult add(@RequestBody BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle)
     {
         BaseEntityUtils.preInsert(bsSgcJsjdWarnResultHandle);
+        bsSgcJsjdWarnResultHandleService.checkHandler(bsSgcJsjdWarnResultHandle);
         return toAjax(bsSgcJsjdWarnResultHandleService.save(bsSgcJsjdWarnResultHandle));
     }
 

jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java

@@ -60,4 +60,7 @@ public class BsSgcJsjdWarnResult extends BaseEntity
     @ApiModelProperty("是否处理")
     private String isHandle;
 
+    @ApiModelProperty("预警类型 0预警 1提醒")
+    private String alertType;
+
 }

jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java

@@ -1,5 +1,7 @@
 package com.kms.warn.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.domain.SearchParam;
@@ -76,4 +78,12 @@ public class BsSgcJsjdWarnResultHandleService extends BaseService<BsSgcJsjdWarnR
         return bsSgcJsjdWarnResultHandle;
 
     }
+
+    public void checkHandler(BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle){
+        if (!ObjectUtil.isEmpty(bsSgcJsjdWarnResultHandle.getCheckUser())){
+            UpdateWrapper<BsSgcJsjdWarnResult>uw=new UpdateWrapper<>();
+            bsSgcJsjdWarnResultMapper.
+                    update(null,uw.eq("id",bsSgcJsjdWarnResultHandle.getResultId()).set("is_handle",1));
+        }
+    }
 }

jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml

@@ -48,8 +48,11 @@
                 <if test="projectName!=null and projectName!=''">
                     and project_name like concat('%',#{projectName},'%')
                 </if>
+                <if test="isMajor!=null and isMajor!=''">
+                    and pp.is_major=#{isMajor}
+                </if>
                 <if test="projectType!=null and projectType!=''">
-                    and project_type=#{projectType}
+                    and pp.project_type=#{projectType}
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -61,8 +64,11 @@
                 <if test="projectName!=null and projectName!=''">
                     and project_name like concat('%',#{projectName},'%')
                 </if>
+                <if test="isMajor!=null and isMajor!=''">
+                    and pp.is_major=#{isMajor}
+                </if>
                 <if test="projectType!=null and projectType!=''">
-                    and project_type=#{projectType}
+                    and pp.project_type=#{projectType}
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>