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/TProjectPoolController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.enums.FileType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
@@ -130,8 +131,11 @@ public class TProjectPoolController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TProjectPool tProjectPool)
     {
+        // todo 设置主键及创建人
         tProjectPool.setCreateBy(getNickName());
         tProjectPool.setId(IdUtils.fastSimpleUUID());
+        int number = tProjectPoolService.selectTProjectPoolCode(DateUtils.lastTwoDigits()+"-");
+        tProjectPool.setProjectCode(tProjectPool.getProjectGroup() + "-" + DateUtils.lastTwoDigits() + "-" + String.format("%03d",number+1));
         TProjectCompany tProjectCompany = tProjectPool.gettProjectCompany();
         tProjectCompany.setCreateBy(getNickName());
         tProjectCompany.setId(IdUtils.fastSimpleUUID());
@@ -142,6 +146,7 @@ public class TProjectPoolController extends BaseController
         tProjectPool.setProjectContacts(tProjectContacts.getId());
         // todo 设置公司信息关联关系
         tProjectCompany.setProjectPoolId(tProjectPool.getId());
+
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();
         if(!tUnifyFileList.isEmpty()){

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

@@ -44,13 +44,13 @@ public class TProjectCompany extends BaseEntity
     @Excel(name = "营业结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
-    /** 注册资本 */
+    /** 注册资本 set方法String.format("%.4f", registeredCapital); */
     private String registeredCapital;
 
     /** 注册地址 */
     private String registeredAddress;
 
-    /** 实缴资本 */
+    /** 实缴资本 set方法String.format("%.4f", paidCapital); */
     private String paidCapital;
 
     /** 办公地址 */
@@ -130,7 +130,7 @@ public class TProjectCompany extends BaseEntity
     }
     public void setRegisteredCapital(String registeredCapital) 
     {
-        this.registeredCapital = registeredCapital;
+        this.registeredCapital = String.format("%.4f", Double.parseDouble(registeredCapital));
     }
 
     public String getRegisteredCapital() 
@@ -148,7 +148,7 @@ public class TProjectCompany extends BaseEntity
     }
     public void setPaidCapital(String paidCapital) 
     {
-        this.paidCapital = paidCapital;
+        this.paidCapital = String.format("%.4f", Double.parseDouble(paidCapital));
     }
 
     public String getPaidCapital() 

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

@@ -40,13 +40,13 @@ public class TProjectMeeting extends BaseEntity
     private String projectPoolId;
 
     /** 会议开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /** 会议结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /** 会议地点 */

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

@@ -37,7 +37,7 @@ public class TProjectPool extends BaseEntity
     private Date recordDate;
 
     /** 项目编号 */
-//    @Excel(name = "项目编号")
+    @Excel(name = "项目编号")
     private String projectCode;
 
     /** 渠道 */

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

@@ -76,6 +76,11 @@ public class TProjectRecord extends BaseEntity
      */
     private TProjectPool tProjectPool;
 
+    /**
+     * 项目名称【查询条件】
+     */
+    private String projectName;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -174,6 +179,14 @@ public class TProjectRecord extends BaseEntity
         this.tProjectPool = tProjectPool;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -67,4 +67,11 @@ public interface TProjectPoolMapper
      * @return 结果
      */
     public int updateTProjectPoolByIds(String[] ids);
+
+    /**
+     * 根绝年份后两位查询编号数量实现自增
+     * @param year
+     * @return
+     */
+    int selectTProjectPoolCode(String year);
 }

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

@@ -67,4 +67,12 @@ public interface ITProjectPoolService
      * @return 结果
      */
     public int updateTProjectPoolByIds(String[] ids);
+
+    /**
+     * 根绝年份后两位查询编号数量实现自增
+     * @param year
+     * @return
+     */
+    int selectTProjectPoolCode(String year);
+
 }

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

@@ -106,4 +106,14 @@ public class TProjectPoolServiceImpl implements ITProjectPoolService
     public int updateTProjectPoolByIds(String[] ids) {
         return tProjectPoolMapper.updateTProjectPoolByIds(ids);
     }
+
+    /**
+     * 根绝年份后两位查询编号数量实现自增
+     * @param year
+     * @return
+     */
+    @Override
+    public int selectTProjectPoolCode(String year) {
+        return tProjectPoolMapper.selectTProjectPoolCode(year);
+    }
 }

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

@@ -261,4 +261,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <select id="selectTProjectPoolCode" parameterType="String" resultType="java.lang.Integer">
+        select count(*) from t_project_pool
+        where project_code like concat('%', #{year}, '%')
+    </select>
+
+
 </mapper>

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

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTProjectRecordVo"/>
         <where>
             a.del_flag = 0
+            <if test="projectName != null and projectName != ''"> and b.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="contacts != null  and contacts != ''"> and a.contacts = #{contacts}</if>
             <if test="realityUpDate != null "> and a.reality_up_date = #{realityUpDate}</if>

ruoyi-ui/README.md

@@ -1,4 +1,4 @@
-## 开发
+ ## 开发
 
 ```bash
 # 克隆项目