xml

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiEnteInfo.java

@@ -38,6 +38,8 @@ public class BsSgcJsjdBuiEnteInfo extends BaseEntity
 
     private String enterpriseType;
 
+    private String duties;
+
 
 
     /** 行政区划 */

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisionAtt.java

@@ -74,4 +74,12 @@ public class BsSgcJsjdBuiSupervisionAtt extends BaseEntity
     @ApiModelProperty("工程监测id")
     private String reportType;
 
+    //整改时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date rectificationTime;
+    //整改提交人
+    private String rectificationPerson;
+    //整改内容
+    private String rectificationContent;
+
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysUser;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectFeasibility;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
@@ -47,6 +48,10 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
         assert sysUser != null;
         List<SpecialProjectPreDesign> list = null;
 
+        if (ObjectUtil.isNotNull(data.getProNo())) {
+            return specialProjectPreDesignMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        }
+
         if (ObjectUtil.isNull(params)) {
             list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysUser;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
@@ -55,7 +56,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         List<SpecialProjectProposal> list = null;
 
         if (ObjectUtil.isNull(data.getProjectCode())) {
-            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), new QueryWrapper<>());
+            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
         }