fix 修改定时多线程

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -244,7 +244,6 @@ public class SysUserController extends BaseController
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:deptTree')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {

ruoyi-system/src/main/java/com/ruoyi/system/domain/investment/ZxInvestment.java

@@ -48,7 +48,7 @@ public class ZxInvestment extends BaseEntity
     @Excel(name = "联系内容")
     private String contactsContent;
     /**
-     * 招商项目状态 1:待审核 2：已审核 3：已签约
+     * 招商项目状态 1:未签约 2：已签约
      */
     private String type;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxInvestmentServiceImpl.java

@@ -16,49 +16,45 @@ import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 政协委员招商引资Service业务层处理
- * 
+ *
  * @author boman
  * @date 2024-03-27
  */
 @Service
-public class ZxInvestmentServiceImpl implements IZxInvestmentService 
-{
+public class ZxInvestmentServiceImpl implements IZxInvestmentService {
     @Autowired
     private ZxInvestmentMapper zxInvestmentMapper;
 
     /**
      * 查询政协委员招商引资
-     * 
+     *
      * @param investmentId 政协委员招商引资主键
      * @return 政协委员招商引资
      */
     @Override
-    public ZxInvestment selectZxInvestmentByInvestmentId(Long investmentId)
-    {
+    public ZxInvestment selectZxInvestmentByInvestmentId(Long investmentId) {
         return zxInvestmentMapper.selectZxInvestmentByInvestmentId(investmentId);
     }
 
     /**
      * 查询政协委员招商引资列表
-     * 
+     *
      * @param zxInvestment 政协委员招商引资
      * @return 政协委员招商引资
      */
     @Override
-    public List<ZxInvestment> selectZxInvestmentList(ZxInvestment zxInvestment)
-    {
+    public List<ZxInvestment> selectZxInvestmentList(ZxInvestment zxInvestment) {
         return zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
     }
 
     /**
      * 新增政协委员招商引资
-     * 
+     *
      * @param zxInvestment 政协委员招商引资
      * @return 结果
      */
     @Override
-    public int insertZxInvestment(ZxInvestment zxInvestment)
-    {
+    public int insertZxInvestment(ZxInvestment zxInvestment) {
         zxInvestment.setUserId(SecurityUtils.getUserId());
         zxInvestment.setName(SecurityUtils.getUsername());
         zxInvestment.setCreateTime(DateUtils.getNowDate());
@@ -67,46 +63,36 @@ public class ZxInvestmentServiceImpl implements IZxInvestmentService
 
     /**
      * 修改政协委员招商引资
-     * 
+     *
      * @param zxInvestment 政协委员招商引资
      * @return 结果
      */
     @Override
-    public AjaxResult updateZxInvestment(ZxInvestment zxInvestment)
-    {
-        ZxInvestment zxInvestmentNew = zxInvestmentMapper.selectZxInvestmentByInvestmentId(zxInvestment.getInvestmentId());
-        if (!zxInvestment.getType().equals(zxInvestmentNew.getType()) && zxInvestment.getType().equals(TWO) && !zxInvestmentNew.getType().equals(ONE)){
-            return AjaxResult.error("项目已签约");
-        }
-        if (!zxInvestment.getType().equals(zxInvestmentNew.getType()) && zxInvestment.getType().equals(THR) && !zxInvestmentNew.getType().equals(TWO)){
-            return AjaxResult.error("项目未审核");
-        }
+    public AjaxResult updateZxInvestment(ZxInvestment zxInvestment) {
         zxInvestment.setUpdateTime(DateUtils.getNowDate());
-         zxInvestmentMapper.updateZxInvestment(zxInvestment);
+        zxInvestmentMapper.updateZxInvestment(zxInvestment);
         return AjaxResult.success();
     }
 
     /**
      * 批量删除政协委员招商引资
-     * 
+     *
      * @param investmentIds 需要删除的政协委员招商引资主键
      * @return 结果
      */
     @Override
-    public int deleteZxInvestmentByInvestmentIds(Long[] investmentIds)
-    {
+    public int deleteZxInvestmentByInvestmentIds(Long[] investmentIds) {
         return zxInvestmentMapper.deleteZxInvestmentByInvestmentIds(investmentIds);
     }
 
     /**
      * 删除政协委员招商引资信息
-     * 
+     *
      * @param investmentId 政协委员招商引资主键
      * @return 结果
      */
     @Override
-    public int deleteZxInvestmentByInvestmentId(Long investmentId)
-    {
+    public int deleteZxInvestmentByInvestmentId(Long investmentId) {
         return zxInvestmentMapper.deleteZxInvestmentByInvestmentId(investmentId);
     }
 }

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

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(publish_time,'%Y') = #{year}
             </if>
         </where>
+        order by publish_time desc
     </select>
     
     <select id="selectZxInvestmentByInvestmentId" parameterType="Long" resultMap="ZxInvestmentResult">