项目进度列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/loan/LoanScheduleController.java

@@ -39,15 +39,13 @@ public class LoanScheduleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:schedule:list')")
     @GetMapping("/list")
-    public TableDataInfo list(LoanSchedule loanSchedule) {
-        startPage();
-        List<LoanSchedule> list = loanScheduleService.selectLoanScheduleList(loanSchedule);
-        return getDataTable(list);
+    public AjaxResult list(LoanSchedule loanSchedule) {
+        return loanScheduleService.selectLoanScheduleList(loanSchedule);
     }
 
-    /**
+/*    *//**
      * 导出业务进度列表
-     */
+     *//*
     @PreAuthorize("@ss.hasPermi('system:schedule:export')")
     @Log(title = "业务进度", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -55,7 +53,7 @@ public class LoanScheduleController extends BaseController {
         List<LoanSchedule> list = loanScheduleService.selectLoanScheduleList(loanSchedule);
         ExcelUtil<LoanSchedule> util = new ExcelUtil<LoanSchedule>(LoanSchedule.class);
         util.exportExcel(response, list, "业务进度数据");
-    }
+    }*/
 
     /**
      * 获取业务进度详细信息

ruoyi-system/src/main/java/com/ruoyi/system/domain/loan/LoanSchedule.java

@@ -38,7 +38,7 @@ public class LoanSchedule extends BaseEntity
 
     /** 进度排序 */
     @Excel(name = "进度排序")
-    private String loanScheduleScore;
+    private Long loanScheduleScore;
 
     /** 进度时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -90,16 +90,16 @@ public class LoanSchedule extends BaseEntity
     {
         return loanScheduleValue;
     }
-    public void setLoanScheduleScore(String loanScheduleScore) 
-    {
-        this.loanScheduleScore = loanScheduleScore;
-    }
 
-    public String getLoanScheduleScore() 
-    {
+    public Long getLoanScheduleScore() {
         return loanScheduleScore;
     }
-    public void setLoanScheduleTime(Date loanScheduleTime) 
+
+    public void setLoanScheduleScore(Long loanScheduleScore) {
+        this.loanScheduleScore = loanScheduleScore;
+    }
+
+    public void setLoanScheduleTime(Date loanScheduleTime)
     {
         this.loanScheduleTime = loanScheduleTime;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/ILoanScheduleService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.loan;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.loan.LoanSchedule;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public interface ILoanScheduleService
      * @param loanSchedule 业务进度
      * @return 业务进度集合
      */
-    public List<LoanSchedule> selectLoanScheduleList(LoanSchedule loanSchedule);
+    public AjaxResult selectLoanScheduleList(LoanSchedule loanSchedule);
 
     /**
      * 新增业务进度

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/impl/LoanScheduleServiceImpl.java

@@ -1,8 +1,13 @@
 package com.ruoyi.system.service.loan.impl;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.loan.LoanSchedule;
+import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.loan.ILoanScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,87 +16,106 @@ import com.ruoyi.system.mapper.LoanScheduleMapper;
 
 /**
  * 业务进度Service业务层处理
- * 
+ *
  * @author boman
  * @date 2024-04-24
  */
 @Service
-public class LoanScheduleServiceImpl implements ILoanScheduleService
-{
+public class LoanScheduleServiceImpl implements ILoanScheduleService {
     @Autowired
     private LoanScheduleMapper loanScheduleMapper;
 
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
     /**
      * 查询业务进度
-     * 
+     *
      * @param loanScheduleId 业务进度主键
      * @return 业务进度
      */
     @Override
-    public LoanSchedule selectLoanScheduleByLoanScheduleId(Long loanScheduleId)
-    {
+    public LoanSchedule selectLoanScheduleByLoanScheduleId(Long loanScheduleId) {
         return loanScheduleMapper.selectLoanScheduleByLoanScheduleId(loanScheduleId);
     }
 
     /**
      * 查询业务进度列表
-     * 
+     *
      * @param loanSchedule 业务进度
      * @return 业务进度
      */
     @Override
-    public List<LoanSchedule> selectLoanScheduleList(LoanSchedule loanSchedule)
-    {
-        return loanScheduleMapper.selectLoanScheduleList(loanSchedule);
+    public AjaxResult selectLoanScheduleList(LoanSchedule loanSchedule) {
+        //字典值中所有进度
+        List<SysDictData> dictDataList = dictDataMapper.selectDictDataByType("loan_schedule");
+        //查询该项目已有的进度
+        List<LoanSchedule> loanSchedules = loanScheduleMapper.selectLoanScheduleList(loanSchedule);
+        Map<String, List<LoanSchedule>> collect = null;
+        if (loanSchedules != null && loanSchedules.size() > 0) {
+            collect = loanSchedules.stream().collect(Collectors.groupingBy(LoanSchedule::getLoanScheduleValue));
+        }
+        List<LoanSchedule> loanScheduleList = new ArrayList<>();
+        for (SysDictData sysDictData : dictDataList) {
+            String dictValue = sysDictData.getDictValue();
+            String dictLabel = sysDictData.getDictLabel();
+            Long dictSort = sysDictData.getDictSort();
+            LoanSchedule loanScheduleNew = new LoanSchedule();
+            loanScheduleNew.setLoanScheduleName(dictLabel);
+            loanScheduleNew.setLoanScheduleTime(null);
+            loanScheduleNew.setLoanScheduleScore(dictSort);
+            if (collect != null){
+                loanScheduleNew.setLoanScheduleTime(collect.get(dictValue).get(0).getLoanScheduleTime());
+            }
+            loanScheduleList.add(loanScheduleNew);
+        }
+        loanScheduleList.sort(Comparator.comparing(LoanSchedule::getLoanScheduleScore));
+        return AjaxResult.success(loanScheduleList);
     }
 
     /**
      * 新增业务进度
-     * 
+     *
      * @param loanSchedule 业务进度
      * @return 结果
      */
     @Override
-    public int insertLoanSchedule(LoanSchedule loanSchedule)
-    {
+    public int insertLoanSchedule(LoanSchedule loanSchedule) {
         loanSchedule.setCreateTime(DateUtils.getNowDate());
         return loanScheduleMapper.insertLoanSchedule(loanSchedule);
     }
 
     /**
      * 修改业务进度
-     * 
+     *
      * @param loanSchedule 业务进度
      * @return 结果
      */
     @Override
-    public int updateLoanSchedule(LoanSchedule loanSchedule)
-    {
+    public int updateLoanSchedule(LoanSchedule loanSchedule) {
         loanSchedule.setUpdateTime(DateUtils.getNowDate());
         return loanScheduleMapper.updateLoanSchedule(loanSchedule);
     }
 
     /**
      * 批量删除业务进度
-     * 
+     *
      * @param loanScheduleIds 需要删除的业务进度主键
      * @return 结果
      */
     @Override
-    public int deleteLoanScheduleByLoanScheduleIds(Long[] loanScheduleIds)
-    {
+    public int deleteLoanScheduleByLoanScheduleIds(Long[] loanScheduleIds) {
         return loanScheduleMapper.deleteLoanScheduleByLoanScheduleIds(loanScheduleIds);
     }
 
     /**
      * 删除业务进度信息
-     * 
+     *
      * @param loanScheduleId 业务进度主键
      * @return 结果
      */
     @Override
-    public int deleteLoanScheduleByLoanScheduleId(Long loanScheduleId)
-    {
+    public int deleteLoanScheduleByLoanScheduleId(Long loanScheduleId) {
         return loanScheduleMapper.deleteLoanScheduleByLoanScheduleId(loanScheduleId);
     }
 }

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 	    </where>
+	    order by create_time desc
 	</select>
 	
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">

ruoyi-system/src/main/resources/mapper/system/SysUserEnterpriseMapper.xml

@@ -100,8 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate()
          </trim>
-        sysdate()
     </insert>
 
     <update id="updateSysUserEnterprise" parameterType="SysUserEnterprise">