页面调整

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

@@ -115,7 +115,7 @@
 		sub_info a
 		WHERE
 		logic_delete_flag = 0
-        and status != '5'
+        and a.status in('1','3','2','9')
 		<if test="startMoney != null">
 			AND a.amt_total &gt;= #{startMoney}
 		</if>

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

@@ -468,7 +468,11 @@
             status_red AS statusRed,
             reason,
             red_name AS redName,
-            red_date AS redDate
+            red_date AS redDate,
+            amt_cz as amtCz,
+            amt_zjz as amtZjz,
+            amt_ss as amtSs,
+            num_p as numP
         from sub_info
         where id = #{id}
     </select>

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

@@ -2,6 +2,7 @@ package com.rtrh.projects.modules.projects.mapper;
 
 import com.rtrh.core.repository.mybatis.MyBatisRepository;
 import com.rtrh.projects.modules.projects.po.SubPreNew;
+import com.rtrh.projects.modules.projects.po.SubPreNewGxj;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,6 +28,8 @@ public interface SubPreNewMapper {
 
     List<SubPreNew> findBySubId(@Param("subId") String subId);
 
+    List<SubPreNewGxj> findByGxjSubId(@Param("subId") String subId);
+
     void saveBatch(@Param("list") List<SubPreNew> list);
 
     SubPreNew findById(@Param("id") String id);

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

@@ -411,6 +411,21 @@
         ORDER BY
             num_stage ASC
     </select>
+    <select id="findByGxjSubId" resultType="com.rtrh.projects.modules.projects.po.SubPreNewGxj">
+        SELECT
+            id,
+            sub_id as subId,
+            sub_pre_gxj_id as subPreGxjId,
+            date_pre as datePre,
+            last_update_userId as lastUpdateUserId,
+            last_update_user_name as lastUpdateUserName,
+            last_update_time as lastUpdateTime
+        FROM
+            sub_pre_new_gxj
+        WHERE
+            sub_id = #{subId}
+          AND logic_delete_flag = 0
+    </select>
     <select id="findById" resultType="com.rtrh.projects.modules.projects.po.SubPreNew">
         SELECT
             id,

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

@@ -29,7 +29,7 @@
                 AND sm.logic_delete_flag = 0
         <where>
             a.logic_delete_flag = 0
-            AND a.`status` = '7'
+            AND a.`status` = '3'
 --             and a.indus_kind in('210','99','2')
             <if test="null != subjectId and '' != subjectId">
                 AND a.subject_id = #{subjectId}

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

@@ -27,7 +27,10 @@
         <!--<property column="work_space_img" name="workSpaceImg" not-null="false" type="java.lang.String" />-->
         <!--<property column="prop_kind" name="propKind" not-null="false" type="java.lang.String" />-->
         <property column="amt_total" name="amtTotal" not-null="false" type="java.math.BigDecimal" />
-
+        <property column="num_p" name="numP" not-null="false" type="java.lang.Integer" />
+        <property column="amt_cz" name="amtCz" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_zjz" name="amtZjz" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ss" name="amtSs" not-null="false" type="java.math.BigDecimal" />
 
         <!--<property column="amt_ly1" name="amtLy1" not-null="false" type="java.math.BigDecimal" />-->
         <!--<property column="amt_ly2" name="amtLy2" not-null="false" type="java.math.BigDecimal" />-->

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

@@ -344,6 +344,15 @@ public class SubInfo extends TableBaseColomn {
 	 */
 	private String ybContent;
 
+	// 产值
+	private BigDecimal amtCz;
+	// 增加值
+	private BigDecimal amtZjz;
+	// 税收
+	private BigDecimal amtSs;
+	// 解决就业人数
+	private Integer numP;
+
 	public String getYbContent() {
 		return ybContent;
 	}
@@ -1078,4 +1087,44 @@ public class SubInfo extends TableBaseColomn {
 	public void setIsRg(Integer isRg) {
 		this.isRg = isRg;
 	}
+
+	public BigDecimal getAmtCz() {
+		return amtCz;
+	}
+
+	public void setAmtCz(BigDecimal amtCz) {
+		this.amtCz = amtCz;
+	}
+
+	public BigDecimal getAmtZjz() {
+		return amtZjz;
+	}
+
+	public void setAmtZjz(BigDecimal amtZjz) {
+		this.amtZjz = amtZjz;
+	}
+
+	public BigDecimal getAmtSs() {
+		return amtSs;
+	}
+
+	public void setAmtSs(BigDecimal amtSs) {
+		this.amtSs = amtSs;
+	}
+
+	public Integer getNumP() {
+		return numP;
+	}
+
+	public void setNumP(Integer numP) {
+		this.numP = numP;
+	}
+
+	public String getStatusName() {
+		return statusName;
+	}
+
+	public void setStatusName(String statusName) {
+		this.statusName = statusName;
+	}
 }

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

@@ -0,0 +1,36 @@
+package com.rtrh.projects.modules.projects.po;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rtrh.projects.modules.system.po.TableBaseColomn;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Setter
+@Getter
+public class SubPreNewGxj extends TableBaseColomn {
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 项目id
+	 */
+	private String subId;
+	/**
+	 * 项目前期id
+	 */
+	private String subPreGxjId;
+	/**
+	 * 开始办理日期
+	 */
+	@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+	@JSONField(format = "yyyy-MM-dd")
+	private Date datePre;
+
+	private String lastUpdateUserName;
+}

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

@@ -326,7 +326,7 @@ public class SubPreNewServiceImpl implements SubPreNewService {
             list = Optional.of(list).orElse(new ArrayList<>());
             List<SubPreNew> newAddList = new ArrayList<>();
             // 按流程节点id分组
-            Map<String, SubPreNew> hasData = list.stream().collect(Collectors.toMap(SubPreNew::getPreFlowId, item -> item));
+            Map<String, SubPreNew> hasData = list.stream().collect(Collectors.toMap(SubPreNew::getPreFlowId, item -> item,(v1,v2)-> v1));
             // 遍历流程节点，如果不存在该节点实例数据，则新增该节点实例的一条数据
             for (SubPreFlow preFlow : preFlows) {
                 if (hasData.containsKey(preFlow.getId())) {
@@ -444,6 +444,21 @@ public class SubPreNewServiceImpl implements SubPreNewService {
                 resultListSort.add(mapSort.get(key));
             }
         }
+
+        List<SubPreNewResultVO> subPreList = resultListSort.stream()
+                .filter(vo -> vo.getDatePlan() == null)
+                .collect(Collectors.toList());
+        List<SubPreNewGxj> subPreNewGxjList = subPreNewMapper.findByGxjSubId(subId);
+        subPreList.forEach(subPre -> {
+            subPreNewGxjList.stream()
+                    .filter(gxj -> gxj.getSubPreGxjId().equals(subPre.getPreFlowId())) // 根据 preFlowId 匹配
+                    .findFirst() // 找到第一个匹配的
+                    .ifPresent(gxj -> subPre.setDatePlan(gxj.getDatePre())); // 如果存在，赋值 datePlan
+        });
+        resultListSort = resultListSort.stream()
+                .filter(vo -> vo.getDatePlan() != null)
+                .collect(Collectors.toList());
+        resultListSort.addAll(subPreList);
         return resultListSort;
     }
 

projects/src/main/webapp/vmodules/problem/info/cbProblem.jsp

@@ -627,18 +627,12 @@
 
                             console.log(planDate);
 
-                            if (item.statusConf  ==  '2' ) {
-                                if (item.num3>item.num2+3){
-                                    $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "red");
-                                }else{
-                                    $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "#EAC100");
-                                }
+                            if (item.statusRed === '1' ) {
+                                $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "red");
+                            }else if (item.statusRed === '2'){
+                                $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "#EAC100");
                             }else{
-                                if (self.daysBetween(planDate,date)>3+item.num2){
-                                    $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "red");
-                                }else{
-                                    $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "#EAC100");
-                                }
+                                $('.layui-table').find('tr[data-index="' + index + '"]').find("td").css('color', "#1e1d19");
                             }
                             $(".layui-table-body  tr").resize(function () {
                                 $(".layui-table-body  tr").each(function (index, val) {

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

@@ -177,6 +177,8 @@
                             </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"
@@ -192,6 +194,17 @@
                                 </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="number" name="numP" id="numP" placeholder="请输入"
+                                           autocomplete="off" required lay-verify="required" class="layui-input"
+                                           v-model="subInfo.numP">
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-row">
                         <div class="layui-col-xs12 layui-col-sm12">
@@ -291,6 +304,16 @@
                                 </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="number" name="amtCz" id="amtCz" placeholder="请输入"
+                                           autocomplete="off" required lay-verify="required" class="layui-input"
+                                           v-model="subInfo.amtCz">
+                                </div>
+                            </div>
+                        </div>
                         <%-- <div class="layui-col-xs6 layui-col-sm6">
                              <div class="layui-form-item">
                                  <label class="layui-form-label"
@@ -302,6 +325,28 @@
                              </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="number" name="amtZjz" id="amtZjz" placeholder="请输入"
+                                           autocomplete="off" required lay-verify="required" class="layui-input"
+                                           v-model="subInfo.amtZjz">
+                                </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="number" name="amtSs" id="amtSs" placeholder="请输入"
+                                           autocomplete="off" required lay-verify="required" class="layui-input"
+                                           v-model="subInfo.amtSs">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
 <%--                    <div class="layui-row" id="isFix" name="isFix" style="display: none">--%>
 <%--                        <div class="layui-col-xs6 layui-col-sm6">--%>
 <%--                            <div class="layui-form-item">--%>
@@ -340,7 +385,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div 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>
@@ -351,6 +396,16 @@
                                 </div>
                             </div>
                         </div>
+                        <div v-if="subInfo.status === '3'" 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">
+                                    <input type="text" id="tcDate" lay-verify="required"  v-model="subInfo.tcDate"
+                                           name="tcDate"
+                                           autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-row">
                         <div class="layui-col-xs6 layui-col-sm6">
@@ -434,46 +489,46 @@
 <%--                            </div>--%>
 <%--                        </div>--%>
 <%--                    </div>--%>
-                    <div class="layui-row">
-                        <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">
-                                    <select v-model="subInfo.cbStatus" lay-filter="cbStatus">
-                                        <option value="">请选择</option>
-                                        <option value="1">正在谋划</option>
-                                        <option value="2">正在洽谈</option>
-                                        <option value="3">已签约</option>
-                                        <option value="4">已备案/已核准</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-row">
-                        <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">
-                                    <input type="text" id=qyDate readonly="readonly" required
-                                           placeholder="请输入" autocomplete="off" class="layui-input"
-                                           v-model="subInfo.qyDate">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-row">
-                        <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">
-                                    <input type="number" name="cbNum" id="cbNum" placeholder="请输入"
-                                           autocomplete="off"  class="layui-input"
-                                           v-model="subInfo.cbNum">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+<%--                    <div class="layui-row">--%>
+<%--                        <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">--%>
+<%--                                    <select v-model="subInfo.cbStatus" lay-filter="cbStatus">--%>
+<%--                                        <option value="">请选择</option>--%>
+<%--                                        <option value="1">正在谋划</option>--%>
+<%--                                        <option value="2">正在洽谈</option>--%>
+<%--                                        <option value="3">已签约</option>--%>
+<%--                                        <option value="4">已备案/已核准</option>--%>
+<%--                                    </select>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                    <div class="layui-row">--%>
+<%--                        <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">--%>
+<%--                                    <input type="text" id=qyDate readonly="readonly" required--%>
+<%--                                           placeholder="请输入" autocomplete="off" class="layui-input"--%>
+<%--                                           v-model="subInfo.qyDate">--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                    <div class="layui-row">--%>
+<%--                        <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">--%>
+<%--                                    <input type="number" name="cbNum" id="cbNum" placeholder="请输入"--%>
+<%--                                           autocomplete="off"  class="layui-input"--%>
+<%--                                           v-model="subInfo.cbNum">--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
 <%--                    <div class="layui-row">--%>
 <%--                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">--%>
 <%--                            <div class="layui-form-item">--%>
@@ -498,7 +553,32 @@
 <%--                            </div>--%>
 <%--                        </div>--%>
 <%--                    </div>--%>
-
+                    <template v-if="subInfo.status !== '2'">
+                        <div v-if="subInfo.status === '9'" class="layui-row">
+                            <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">
+                                        <input type="text" id="rtDate" lay-verify="required"  v-model="subInfo.rtDate"
+                                               name="rtDate"
+                                               autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div v-if="subInfo.status === '9'" class="layui-row">
+                            <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">
+                                        <input type="text" id="rgDate" lay-verify="required"  v-model="subInfo.rgDate"
+                                               name="rgDate"
+                                               autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
                     <div class="layui-row">
                         <div class='layui-form-item'>
                             <label class="layui-form-label">备注</label>
@@ -547,6 +627,9 @@
                 propKind: "",
                 kind: "",
                 abc: "",
+                rtDate: null,
+                rgDate: null,
+                tcDate: null
             },
             kindAmt: {},
             testAmt: "",
@@ -576,6 +659,30 @@
                         self.subInfo.qyDate = value
                     }
                 });
+                layui.laydate.render({
+                    elem: "#rtDate",
+                    type: "date",
+                    theme: layDateTheme,
+                    done: function (data) {
+                        self.subInfo.rtDate = data;
+                    }
+                });
+                layui.laydate.render({
+                    elem: "#tcDate",
+                    type: "date",
+                    theme: layDateTheme,
+                    done: function (data) {
+                        self.subInfo.tcDate = data;
+                    }
+                });
+                layui.laydate.render({
+                    elem: "#rgDate",
+                    type: "date",
+                    theme: layDateTheme,
+                    done: function (data) {
+                        self.subInfo.rgDate = data;
+                    }
+                });
                 layui.laydate.render({
                     elem: "#beginDate",
                     type: "date",
@@ -866,7 +973,7 @@
                 // this.subInfo.subSource = saveAmtSource;
 
                 App.msg.confirm("确认提交项目信息吗？", function () {
-                    console.log(self.subInfo)
+                    console.log(self.subInfo.tcDate)
                     App.postJson(saveUrl, {subInfo: self.subInfo}, function (res) {
                         if (res.success) {
                             self.closeMark = true;