Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -175,6 +175,8 @@ public class TProjectContractController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectContractService.deleteTProjectContractByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -174,6 +174,8 @@ public class TProjectInformationController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectInformationService.updateTProjectInformationByIds(ids));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigateController.java

@@ -171,4 +171,17 @@ public class TProjectInvestigateController extends BaseController
         ajax.put("tProjectInvestigate", tProjectInvestigate);
         return ajax;
     }
+
+    /**
+     * 修改尽调完成
+     */
+    @ApiOperation("修改尽调完成")
+    @Log(title = "修改尽调完成", businessType = BusinessType.UPDATE)
+    @PutMapping("/editStatus")
+    public AjaxResult editStatus(@RequestBody String id)
+    {
+        return toAjax(tProjectInvestigateService.editStatus(id));
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigatePersonController.java

@@ -157,6 +157,8 @@ public class TProjectInvestigatePersonController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectInvestigatePersonService.deleteTProjectInvestigatePersonByIds(ids));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -184,6 +184,8 @@ public class TProjectMeetingController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectMeetingService.updateTProjectMeetingByIds(ids));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -173,6 +173,8 @@ public class TProjectRecordController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectRecordService.updateTProjectRecordByIds(ids));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TStudyInformationController.java

@@ -64,6 +64,7 @@ public class TStudyInformationController extends BaseController
     public TableDataInfo list(TStudyInformation tStudyInformation)
     {
         startPage();
+        tStudyInformation.setCreateBy(getNickName());//默认登陆人权限
         List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation);
         return getDataTable(list);
     }
@@ -77,6 +78,7 @@ public class TStudyInformationController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TStudyInformation tStudyInformation)
     {
+        tStudyInformation.setCreateBy(getNickName());//默认登陆人权限
         List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation)
                 .stream().map(n -> {
                     n.setContractType(dictDataService.selectDictLabel("file_type",n.getContractType()));

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectInvestigate.java

@@ -51,6 +51,9 @@ public class TProjectInvestigate extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
+    /** 状态 */
+    private String status;
+
     /**
      * 附件信息
      */
@@ -146,6 +149,14 @@ public class TProjectInvestigate extends BaseEntity
         this.listFile = listFile;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectInvestigateMapper.java

@@ -72,4 +72,11 @@ public interface TProjectInvestigateMapper
      * @return
      */
     TProjectInvestigate listProjectPoolId(String projectPoolId);
+
+    /**
+     * 修改尽调完成
+     * @param id
+     * @return
+     */
+    int editStatus(String id);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectInvestigateService.java

@@ -72,4 +72,11 @@ public interface ITProjectInvestigateService
      * @return
      */
     TProjectInvestigate listProjectPoolId(String projectPoolId);
+
+    /**
+     * 修改尽调完成
+     * @param id
+     * @return
+     */
+    int editStatus(String id);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectInvestigateServiceImpl.java

@@ -114,4 +114,14 @@ public class TProjectInvestigateServiceImpl implements ITProjectInvestigateServi
     public TProjectInvestigate listProjectPoolId(String projectPoolId) {
         return tProjectInvestigateMapper.listProjectPoolId(projectPoolId);
     }
+
+    /**
+     * 修改尽调完成
+     * @param id
+     * @return
+     */
+    @Override
+    public int editStatus(String id) {
+        return tProjectInvestigateMapper.editStatus(id);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TUnifyFileMapper.java

@@ -81,4 +81,12 @@ public interface TUnifyFileMapper
      * @return
      */
     List<TUnifyFile> listFileId(@Param("fileId")String fileId);
+
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    int updateTUnifyFileBusinessIds(@Param("fileBusinessIds")String[] fileBusinessIds);
 }

ruoyi-system/src/main/java/com/ruoyi/tool/service/ITUnifyFileService.java

@@ -70,6 +70,14 @@ public interface ITUnifyFileService
      */
     public int updateTUnifyFileByIds(String[] ids);
 
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    public int updateTUnifyFileBusinessIds(String[] fileBusinessIds);
+
     /**
      * 根据附件业务ID()获取附件详情信息列表
      *

ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TUnifyFileServiceImpl.java

@@ -114,6 +114,17 @@ public class TUnifyFileServiceImpl implements ITUnifyFileService
         return tUnifyFileMapper.updateTUnifyFileByIds(ids);
     }
 
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    @Override
+    public int updateTUnifyFileBusinessIds(String[] fileBusinessIds) {
+        return tUnifyFileMapper.updateTUnifyFileBusinessIds(fileBusinessIds);
+    }
+
     /**
      * 根据附件业务ID()获取附件详情信息列表
      * @param fileBusinessId

ruoyi-system/src/main/resources/mapper/invest/TProjectInvestigateMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="describe"    column="describe_"    />
         <result property="remark"    column="remark"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProjectInvestigateVo">
-        select id, investigate_name, investigate_code, project_pool_id, investigate_person, investigate_person_id, investigate_cost, describe_, remark, del_flag, create_by, create_time, update_by, update_time from t_project_investigate
+        select id, investigate_name, investigate_code, project_pool_id, investigate_person, investigate_person_id, investigate_cost, describe_, remark, status, del_flag, create_by, create_time, update_by, update_time from t_project_investigate
     </sql>
 
     <select id="selectTProjectInvestigateList" parameterType="TProjectInvestigate" resultMap="TProjectInvestigateResult">
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigateCost != null">investigate_cost,</if>
             <if test="describe != null">describe_,</if>
             <if test="remark != null">remark,</if>
+            <if test="status != null">status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigateCost != null">#{investigateCost},</if>
             <if test="describe != null">#{describe},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="status != null">#{status},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigateCost != null">investigate_cost = #{investigateCost},</if>
             <if test="describe != null">describe_ = #{describe},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -124,5 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where project_pool_id = #{projectPoolId} and del_flag = 0
     </select>
 
+    <update id="editStatus" parameterType="String">
+        update t_project_investigate
+        set status = 1
+        where id = #{id}
+    </update>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/invest/TProjectMeetingMapper.xml

@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="meetingTheme != null  and meetingTheme != ''"> and a.meeting_theme like concat('%', #{meetingTheme}, '%')</if>
             <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code like concat('%', #{meetingCode}, '%')</if>
             <if test="meetingType != null  and meetingType != ''"> and a.meeting_type = #{meetingType}</if>
-            <if test="startTime != null "> and a.start_time &gt;= #{startTime}</if>
-            <if test="endTime != null "> and a.end_time &lt;= #{endTime}</if>
+            <if test="startTime != null "> and DATE_FORMAT(a.start_time, '%Y-%m-%d') &gt;= #{startTime}</if>
+            <if test="endTime != null "> and DATE_FORMAT(a.end_time, '%Y-%m-%d') &lt;= #{endTime}</if>
         </where>
     </select>
     

ruoyi-system/src/main/resources/mapper/invest/TProjectPoolMapper.xml

@@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTProjectPoolList" parameterType="TProjectPool" resultMap="TProjectPoolResult">
         <include refid="selectTProjectPoolVo"/>
         <where>
-            a.del_flag = 0
             <if test="projectName != null  and projectName != ''"> and a.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectGroup != null  and projectGroup != ''"> and a.project_group = #{projectGroup}</if>
             <if test="projectCode != null  and projectCode != ''"> and a.project_code = #{projectCode}</if>

ruoyi-system/src/main/resources/mapper/tool/TUnifyFileMapper.xml

@@ -116,6 +116,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="updateTUnifyFileBusinessIds" parameterType="String">
+        update t_unify_file
+        set del_flag = 1
+        where file_business_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <select id="selectTUnifyFileByBusinessIdList" parameterType="String" resultMap="TUnifyFileResult">
         <include refid="selectTUnifyFileVo"/>
         where file_business_id = #{fileBusinessId} and del_flag = 0