Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

# Conflicts:
#	ruoyi-ui/src/views/project/projectChecking/index.vue

ruoyi-ui/src/api/project/projectCommittee.js

@@ -35,6 +35,8 @@ export function updateProjectCommittee(data) {
   })
 }
 
+
+
 // 删除工委会管理
 export function delProjectCommittee(id) {
   return request({

ruoyi-ui/src/views/project/projectChecking/index.vue

@@ -416,6 +416,7 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="验收图片" prop="imageUrls">
+          <image-upload v-model="form.dataTypeLvl1" :limit="9" />
           <image-upload v-model="form.imageUrls" :limit="9" />
         </el-form-item>
         <el-form-item label="验收类型" prop="dataTypeLvl1">
@@ -504,6 +505,14 @@
           <el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="验收时间" prop="checkingDate">
+          <el-date-picker
+            style="width: 100%"
+            v-model="form.checkingDate"
+            type="datetime"
+            placeholder="选择日期时间"
+            default-time="10:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          >
           <el-date-picker
             style="width: 100%"
             v-model="form.checkingDate"

ruoyi-ui/src/views/project/projectCommittee/index.vue

@@ -46,6 +46,15 @@
     <el-table v-loading="loading" :data="projectCommitteeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" v-if="1 == 2" />
       <el-table-column label="期名" align="center" prop="committeeName" />
+      <el-table-column label="申请时间" align="center" prop="applicationDate">
+        <template slot-scope="scope">
+          <el-date-picker style="width:140px;"
+      v-model="scope.row.applicationDate" @change="doUpdateApplicationDate(scope.row)"
+      type="date"
+      placeholder="申请时间">
+    </el-date-picker>
+        </template>
+      </el-table-column>
       <el-table-column label="项目" align="center" prop="projectName" />
       <el-table-column label="分类" align="center" prop="typeName" />
       <el-table-column label="成本名称" align="center" prop="costName" />
@@ -143,6 +152,13 @@ export default {
         this.loading = false;
       });
     },
+    doUpdateApplicationDate(row){
+      updateProjectCommittee(row).then(d=>{
+        if(d.code==200){
+          this.$modal.msgSuccess("修改成功");
+        }
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java

@@ -97,6 +97,14 @@ public class SurProjectCheckingController extends BaseController
         surProjectChecking.setNowUser(Convert.toStr(getUserId()));
         surProjectChecking.setNowUserName(getUsername());
         List<SurProjectChecking> list = surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking);
+        for(SurProjectChecking checking:list){
+            if("2".equals(checking.getCheckResult())){
+                checking.setCheckResult("不合格");
+            }
+            if("1".equals(checking.getCheckResult())){
+                checking.setCheckResult("合格");
+            }
+        }
         ExcelUtil<SurProjectChecking> util = new ExcelUtil<SurProjectChecking>(SurProjectChecking.class);
         util.exportExcel(response, list, "举牌验收数据");
     }

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java

@@ -34,11 +34,9 @@ public class SurProjectChecking extends BaseEntity
     private Long deptId;
 
     /** 分包单位主键 */
-    @Excel(name = "分包单位主键")
     private Long groupDeptId;
 
     /** 验收类型 */
-    @Excel(name = "验收类型")
     private String checkType;
 
     @Excel(name = "验收大类")
@@ -48,15 +46,12 @@ public class SurProjectChecking extends BaseEntity
     private String dataTypeLvl2Name;
 
     /** 验收主图 */
-    @Excel(name = "验收主图")
     private String mainImage;
 
     /** 图片列表 */
-    @Excel(name = "图片列表")
     private String imageUrls;
 
     /** 验收工序部位类型 */
-    @Excel(name = "验收工序部位类型")
     private String workingPositionType;
 
     /** 验收工序部位 */

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 工委会管理对象 sur_project_working_committee
  * 
@@ -53,6 +55,17 @@ public class SurProjectWorkingCommittee extends BaseEntity
         this.typeName = typeName;
     }
 
+    /** 申请日期 **/
+    private Date applicationDate;
+
+    public Date getApplicationDate() {
+        return applicationDate;
+    }
+
+    public void setApplicationDate(Date applicationDate) {
+        this.applicationDate = applicationDate;
+    }
+
     /**  */
     private Long id;
 

yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml

@@ -209,6 +209,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sur_project_cost_output a,sur_project sp
         WHERE a.project_id=sp.id AND a.cost_type in (11,12)
         and sp.isDel=0 and sp.progressVisible=0
+        <if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
+        <if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
         <if test="id!=null and id>0"> and sp.deptId = #{id}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="projectId!=null and projectId>0">
@@ -228,6 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sur_project_cost_output a,sur_project sp
         WHERE a.project_id=sp.id AND a.cost_type in (11)
         and sp.isDel=0 and sp.progressVisible=0
+        <if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
+        <if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
         <if test="id!=null and id>0"> and sp.deptId = #{id}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="projectId!=null and projectId>0">
@@ -246,6 +250,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sur_project_cost_output a,sur_project sp
         WHERE a.project_id=sp.id AND a.cost_type IN (12)
         and sp.isDel=0 and sp.progressVisible=0
+        <if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
+        <if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
         <if test="id!=null and id>0"> and sp.deptId = #{id}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="projectId!=null and projectId>0">
@@ -263,6 +269,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sur_project_cost_output a,sur_project sp
         WHERE a.project_id=sp.id AND a.cost_type IN (11,12)
         and sp.isDel=0 and sp.progressVisible=0
+        <if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
+        <if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
         <if test="id!=null and id>0"> and sp.deptId = #{id}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="projectId!=null and projectId>0">

yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="committeeName"    column="committeeName"    />
         <result property="projectName"    column="projectName"    />
         <result property="typeName"    column="typeName"    />
+        <result property="applicationDate" column="applicationDate"/>
     </resultMap>
 
     <sql id="selectSurProjectWorkingCommitteeVo">
-        select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time
+        select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time,applicationDate
         from sur_project_working_committee
     </sql>
 
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="applicationDate != null">applicationDate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="committeeId != null">#{committeeId},</if>
@@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="applicationDate != null">#{applicationDate},</if>
          </trim>
     </insert>
 
@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="applicationDate != null">applicationDate = #{applicationDate},</if>
         </trim>
         where id = #{id}
     </update>
@@ -111,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from (
                  select a.* from  sur_project_working_committee a,sur_project  b
                  where  a.projectId=b.id
+                <if test="createTime!=null "> and a.applicationDate &gt;= #{createTime}</if>
+                <if test="updateTime!=null "> and a.applicationDate &lt;= #{updateTime}</if>
                 <if test="committeeId!=null and committeeId!='0' and committeeId &gt; 0">
                     and a.committeeId=#{committeeId}
                 </if>
@@ -135,9 +141,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectByWorkingType" parameterType="SurProjectWorkingCommittee" resultMap="SurProjectWorkingCommitteeResult">
-        select a.id,a.costName,a.money,b.projectName remark,a.committeeid,a.workingType,a.projectId,a.create_by,a.create_time,a.update_time,c.name update_by
+        select a.id,a.costName,a.money,b.projectName remark,a.committeeid,a.workingType,a.projectId,a.create_by,a.create_time,a.update_time,c.name update_by,a.applicationDate
         from sur_project_working_committee a,sur_project  b ,base_working_committee c
         where a.projectId=b.id and a.committeeid=c.id
+        <if test="createTime!=null "> and a.applicationDate &gt;= #{createTime}</if>
+        <if test="updateTime!=null "> and a.applicationDate &lt;= #{updateTime}</if>
         <if test="committeeId!=null and committeeId!='0' and committeeId &gt; 0">
             and a.committeeId=#{committeeId}
         </if>