工信局今日bug修改及功能优化

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -4,12 +4,12 @@ import java.util.List;
 import java.util.Map;
 
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
-import com.rtrh.projects.modules.projects.po.RptCont;
 import com.rtrh.projects.modules.projects.po.SubFix;
 import com.rtrh.projects.modules.projects.po.SubInfo;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.export.*;
+import com.rtrh.projects.modules.system.vo.LoginUserVO;
 import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -142,4 +142,6 @@ public interface SubInfoMapper {
     void batchUpdateEndSubInfo(@Param("list") List<SubInfoGxj> list);
 
     void batchUpdateMainSubInfo(@Param("list") List<SubInfoGxj> list);
+
+    List<Map<String, Object>> subInfoList(@Param("g") LoginUserVO loginUserVO, @Param("q") SubInfoQueryTzVO queryTzVO);
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -531,7 +531,9 @@
             amt_cz as amtCz,
             amt_zjz as amtZjz,
             amt_ss as amtSs,
-            num_p as numP
+            num_p as numP,
+            chh_desc as chhDesc,
+            name_zrr_lead as nameZrrLead
         from sub_info
         where id = #{id}
     </select>
@@ -1408,4 +1410,24 @@
             </foreach>
         </if>
     </select>
+
+    <select id="subInfoList" resultType="java.util.Map">
+        SELECT
+            a.id,
+            b.title as unitName,
+            a.sub_name as subName
+        FROM
+            sub_info a
+                LEFT JOIN j_unit b ON a.unit_id = b.id
+                LEFT JOIN j_unit c ON a.main_id = c.id
+                LEFT JOIN t_systable ts ON ts.`code` = a.subject_id
+                AND ts.kind = 'JSDD'
+        WHERE
+            a.logic_delete_flag = 0
+          AND a.STATUS IN ( '1', '2', '3', '9' )
+          AND NOT EXISTS ( SELECT 1 FROM sub_fix f WHERE a.id = f.sub_id AND f.YEAR = #{q.year} )
+          <if test="q.subName != null and q.subName != ''">
+              and a.sub_name like concat('%',#{q.subName},'%')
+          </if>
+    </select>
 </mapper>

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfo.hbm.xml

@@ -103,6 +103,8 @@
         <!--<property column="indus_name" name="indusName" not-null="false" type="java.lang.String" />-->
 
         <!--<property column="subject_name" name="subjectName" not-null="false" type="java.lang.String" />-->
+        <property column="chh_desc" name="chhDesc" not-null="false" type="java.lang.String" />
+        <property column="name_zrr_lead" name="nameZrrLead" not-null="false" type="java.lang.String" />
         <property column="rt_date" name="rtDate" not-null="false" type="java.util.Date" />
         <property column="cb_status" name="cbStatus" not-null="false" type="java.lang.String" />
         <property column="qy_date" name="qyDate" not-null="false" type="java.util.Date" />

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfo.java

@@ -353,6 +353,11 @@ public class SubInfo extends TableBaseColomn {
 	// 解决就业人数
 	private Integer numP;
 
+	// 牵头部门
+	private String chhDesc;
+	// 责任领导
+	private String nameZrrLead;
+
 	public String getYbContent() {
 		return ybContent;
 	}
@@ -1127,4 +1132,20 @@ public class SubInfo extends TableBaseColomn {
 	public void setStatusName(String statusName) {
 		this.statusName = statusName;
 	}
+
+	public String getChhDesc() {
+		return chhDesc;
+	}
+
+	public void setChhDesc(String chhDesc) {
+		this.chhDesc = chhDesc;
+	}
+
+	public String getNameZrrLead() {
+		return nameZrrLead;
+	}
+
+	public void setNameZrrLead(String nameZrrLead) {
+		this.nameZrrLead = nameZrrLead;
+	}
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubPreNew.java

@@ -9,6 +9,8 @@ import com.rtrh.projects.modules.system.po.TableBaseColomn;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.Transient;
+
 @Setter
 @Getter
 public class SubPreNew extends TableBaseColomn {
@@ -119,4 +121,7 @@ public class SubPreNew extends TableBaseColomn {
 	 */
 	private String transactorsPhone;
 
+	@Transient
+	private String datePre;
+
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubPreNewGxj.java

@@ -29,7 +29,7 @@ public class SubPreNewGxj implements Serializable {
 
     private String subPreGxjId;
 
-    private Date datePre;
+    private String datePre;
 
     private String lastUpdateUserid;
 

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

@@ -27,6 +27,8 @@ public interface SubInfoQueryService {
 	 */
 	public Page pageAll(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO);
 
+	Page subInfoPage(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO);
+
 	Map<String, BigDecimal> sumRate(SubInfoQueryTzVO queryTzVO, LoginUserVO loginUserVO);
 
 	/**

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

@@ -527,6 +527,15 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         return page;
     }
 
+    @Override
+    public Page subInfoPage(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
+        PageHelper.startPage(page.getPageNo(), page.getPageSize());
+        List<Map<String, Object>> data = subInfoMapper.subInfoList(loginUserVO,queryTzVO);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(data);
+        page.setList(data);
+        page.setTotalCount(pageInfo.getTotal());
+        return page;
+    }
 
     @Override
     public Map<String, BigDecimal> sumRate(SubInfoQueryTzVO queryTzVO, LoginUserVO loginUserVO) {

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

@@ -96,9 +96,7 @@ public class SubPreGxjInfoServiceImpl implements ISubPreGxjInfoService {
                     preNewGxj.setId(IdUtil.getSnowflakeNextIdStr());
                     preNewGxj.setSubId(subId);
                     preNewGxj.setSubPreGxjId(item.getSubPreFlowGxjId());
-                    if (StrUtil.isNotBlank(item.getDatePre())){
-                        preNewGxj.setDatePre(DateUtil.parse(item.getDatePre(), "yyyy-MM-dd"));
-                    }
+                    preNewGxj.setDatePre(item.getDatePre());
                     preNewGxj.setLastUpdateUserName(userVO.getLoginName());
                     preNewGxj.setLastUpdateTime(new Date());
                     preNewGxj.setLastUpdateUserid(userVO.getId());
@@ -115,7 +113,7 @@ public class SubPreGxjInfoServiceImpl implements ISubPreGxjInfoService {
             return subPreGxjConMapper.findById(vo.getId());
         }else {
             List<SubPreGxjCon> procedureList = subPreGxjConMapper.findAllPreFlowGxj();
-            procedureList.forEach(e -> e.setDatePre(DateUtil.format(new Date(), "yyyy-MM-dd")));
+            procedureList.forEach(e -> e.setDatePre(""));
             return new SubPreFlowGxjVO().setProcedureList(procedureList);
         }
     }
@@ -183,11 +181,16 @@ public class SubPreGxjInfoServiceImpl implements ISubPreGxjInfoService {
 
     @Override
     public Page queryProcedurePage(Page page, LoginUserVO loginUser, SubInfoQueryTzVO queryVO) {
+        Map<String, String> kindMap = tSysTableService.getCodeTitleMapByKind(SysTableKind.JSDD);
         PageHelper.startPage(page.getPageNo(), page.getPageSize());
-        List<PreInfoVO> data = this.queryAllPreInfo(loginUser, queryVO);
+       // List<PreInfoVO> data = this.queryAllPreInfo(loginUser, queryVO);
+        List<PreInfoVO> data = subPreGxjInfoMapper.queryAllPreInfo(queryVO);
         PageInfo<PreInfoVO> pageInfo = new PageInfo<>(data);
-        page.setList(data);
         page.setTotalCount(pageInfo.getTotal());
+        for (PreInfoVO preInfoVO:data){
+            preInfoVO.setSubjectName(kindMap.get(preInfoVO.getSubjectId()));
+        }
+        page.setList(data);
         return page;
     }
 }

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

@@ -453,7 +453,7 @@ public class SubPreNewServiceImpl implements SubPreNewService {
             subPreNewGxjList.stream()
                     .filter(gxj -> gxj.getSubPreGxjId().equals(subPre.getPreFlowId())) // 根据 preFlowId 匹配
                     .findFirst() // 找到第一个匹配的
-                    .ifPresent(gxj -> subPre.setDatePlan(gxj.getDatePre())); // 如果存在，赋值 datePlan
+                    .ifPresent(gxj -> subPre.setDatePre(gxj.getDatePre())); // 如果存在，赋值 datePlan
         });
         resultListSort = resultListSort.stream()
                 .filter(vo -> vo.getDatePlan() != null)

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/PreNewConGxjVO.java

@@ -95,8 +95,8 @@ public class PreNewConGxjVO {
             subPreNewGxj.setLastUpdateUserid(loginUser.getId());
             subPreNewGxj.setLastUpdateUserName(loginUser.getRealName());
             subPreNewGxj.setLogicDeleteFlag(false);
-            Date datePre = BeanUtil.getProperty(this, v);
-            subPreNewGxj.setDatePre(datePre);
+            //Date datePre = BeanUtil.getProperty(this, v);
+            subPreNewGxj.setDatePre(v);
             list.add(subPreNewGxj);
         });
         return list;

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

@@ -86,6 +86,25 @@ public class SubInfoQueryApiController extends BaseController {
         return message;
     }
 
+    /**
+     * 查询可纳入项目
+     * @param page
+     * @param queryVO
+     * @return
+     */
+    @PostMapping("subInfoPage")
+    public ListMessage subInfoPage(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+            Page pageData = subInfoQueryService.subInfoPage(page, getCurUser().getLoginUser(), queryVO);
+            message.add(pageData.getList(), pageData.getTotalCount());
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
     /**
      * 获取重点项目数据
      *

projects/src/main/webapp/vmodules/subPreNew/sub_list.jsp

@@ -247,6 +247,17 @@
 	</div>
 </script>
 
+<script type="text/html" id="datePlan">
+	{{# var isEmpty = function (str){
+	return !str || str.length === 0;
+	} }}
+	{{# if(isEmpty(d.datePlan)) { }}
+	<span>{{isEmpty(d.datePre)?'':d.datePre}}</span>
+	{{# }else { }}
+	<span>{{d.datePlan}}</span>
+	{{#} }}
+</script>
+
 <script type="text/html" id="toolBar">
 	<div class="toolBar">
 	<span title="详情"  lay-event="detail">详情</span>
@@ -283,7 +294,7 @@ new Vue({
 					{field: 'light', title: '亮灯预警',type:'string', fixed: 'left', width: 80, templet: '#light'},
 
 					{field: 'status', title: '办理状态', minWidth: 100, templet: '#status'},
-					{field: 'datePlan', title: '开始办理日期', width: 100},
+					{field: 'datePlan', title: '开始办理日期', width: 100,templet: '#datePlan'},
 					{field: 'num2', title: '计划办理天数',align:'center',type:'string', width: 105,templet: '#num2'},
 					{field: 'num3', title: '办理天数', width: 80,align:'center'},
 					{field: 'num4', title: '节约天数',align:'center',type:'string', width: 100,templet: '#num4'},

projects/src/main/webapp/vmodules/subject/subInfo/chooseSubInto.jsp

@@ -134,7 +134,7 @@
                 searchForm.endDate = formattedEnd;
                 searchForm.queryTimeType = "0";//查询全部项目
                 //查询当前没有被纳入的
-                App.postJson("/api/subInfo/query/all", searchForm, function (res) {
+                App.postJson("/api/subInfo/query/subInfoPage", searchForm, function (res) {
                     methods.initTable(res.rows);
                     methods.loadPage(res.total);
                 });

projects/src/main/webapp/vmodules/subject/subInfo/editProcedure.jsp

@@ -250,10 +250,12 @@
             },
             initProcedureList: function () {
                 let self = this;
-                console.log("self.procedureList",self.procedureList)
+                console.log("self.procedureList",self.subInfo.procedureList)
                 layui.table.render({
                     elem: '#procedureTable', // 指定原始表格元素选择器（推荐id选择器）
                     even: true,
+                    page: false,
+                    limit: 20,
                     cols: [[ // 设置表头
                         {type: 'numbers', title: '序号'},
                         {field: 'title', title: '手续名称'},
@@ -263,6 +265,7 @@
                     ]],
                     data: self.subInfo.procedureList
                 });
+                console.log("After render:", self.subInfo.procedureList);
                 //监听单元格事件
                 layui.table.on('tool(procedureTable)', function(obj) {
                     console.log('tool: ', obj.event)

projects/src/main/webapp/vmodules/subject/subInfo/editSubInfo.jsp

@@ -385,7 +385,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div v-if="subInfo.status != '3'"  class="layui-col-xs6 layui-col-sm6">
+                       <%-- <div v-if="subInfo.status != '3'"  class="layui-col-xs6 layui-col-sm6">
                             <div class="layui-form-item">
                                 <label class="layui-form-label required"
                                 >计划竣工时间</label>
@@ -396,8 +396,8 @@
                                            v-model="subInfo.endDate">
                                 </div>
                             </div>
-                        </div>
-                        <div v-if="subInfo.status === '3'" class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                        </div>--%>
+                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                             <div class="layui-form-item">
                                 <label class="layui-form-label">计划投产日期</label>
                                 <div class="layui-input-block">
@@ -451,6 +451,27 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-row">
+                        <div class="layui-col-xs6 layui-col-sm6">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label required"
+                                >牵头部门</label>
+                                <div class="layui-input-block">
+                                    <input type="text" required lay-verify="required" placeholder="请输入"
+                                           autocomplete="off" class="layui-input" v-model="subInfo.chhDesc">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 layui-col-sm6">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label required">责任领导</label>
+                                <div class="layui-input-block">
+                                    <input type="text" required lay-verify="required" placeholder="请输入"
+                                           autocomplete="off" class="layui-input" v-model="subInfo.nameZrrLead">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="layui-row">
                         <div class="layui-col-xs12 layui-col-sm12">
                             <div class="layui-form-item">

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

@@ -115,7 +115,7 @@
     <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <div class="txt">项目总库 <div class="top-breadcrumb"></div></div>
+            <div class="txt">手续管理 <div class="top-breadcrumb"></div></div>
             <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <div class="layui-colla-content layui-show">