Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -36,7 +36,7 @@ public class HomeNoticeController extends BaseController {
 
     @ApiOperation(value = "查询首页公告")
     @PostMapping("/selectHomeNotice")
-    @PreAuthorize("@ss.hasPermi('home:homeNotice:selecthomeNotice')")
+//    @PreAuthorize("@ss.hasPermi('home:homeNotice:selecthomeNotice')")
     @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
     public AjaxResult selectHomeNotice(@RequestBody HomeNoticeVo homeNoticeVo) {
         LambdaQueryWrapper<HomeNotice> lw = new LambdaQueryWrapper<HomeNotice>();

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNotificationMessageController.java

@@ -9,7 +9,6 @@ import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.R;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.home.domain.HomeNotificationMessage;
@@ -19,7 +18,6 @@ import com.ozs.home.service.HomeNotificationMessageService;
 import com.ozs.pm.doman.PmDemand;
 import com.ozs.pm.mapper.PmDemandMapper;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +41,7 @@ public class HomeNotificationMessageController extends BaseController {
 
     @ApiOperation(value = "查询首页通知消息")
     @PostMapping("/selectHomeNotificationMessage")
-    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:selectHomeNotificationMessage')")
+//    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:selectHomeNotificationMessage')")
     @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
     public AjaxResult selectHomeNotificationMessage(@RequestBody HomeNotificationMessageVo homeNotificationMessageVo) {
         LambdaQueryWrapper<HomeNotificationMessage> lw = new LambdaQueryWrapper<HomeNotificationMessage>();
@@ -60,7 +58,7 @@ public class HomeNotificationMessageController extends BaseController {
 
     @ApiOperation(value = "填写滞后原因")
     @PostMapping("/saveReasonsForLag")
-    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:saveReasonsForLag')")
+//    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:saveReasonsForLag')")
     @Log(title = ModularConstans.notice, businessType = BusinessType.UPDATE)
     public AjaxResult saveReasonsForLag(@RequestBody ReasonsForLagVo reasonsForLagVo) {
         HomeNotificationMessage homeNotificationMessage = homeNotificationMessageService.getById(reasonsForLagVo.getHomeNotificationMessageId());

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -8,7 +8,6 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
-import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.service.PlanQuarterService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

purchase-system/src/main/java/com/ozs/home/domain/HomeNotice.java

@@ -39,7 +39,7 @@ public class HomeNotice extends BaseEntity {
     private Date noticeTime;
 
     /** 采购项目编号 */
-    private Long projectNo;
+    private String projectNo;
 
     /** 合同履行日期 */
     private String performanceDate;

purchase-system/src/main/java/com/ozs/home/domain/HomeNotificationMessage.java

@@ -1,6 +1,8 @@
 package com.ozs.home.domain;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -23,6 +25,7 @@ import java.util.Date;
 public class HomeNotificationMessage extends BaseEntity {
 
     /** 主键 */
+    @TableId(type = IdType.AUTO)
     private Long homeNotificationMessageId;
 
     /** 首页分类（0需求单位首页1采购管理部门首页2采购部首页） */

purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNotificationMessageVo.java

@@ -23,6 +23,6 @@ public class HomeNotificationMessageVo extends PageVo {
     /** 首页分类（0需求单位首页1采购管理部门首页2采购部首页） */
     private String homepageClassification;
 
-    /** 公消息分类(0预警消息1.发函催告2.预期告警) */
+    /** 公告消息分类(0预警消息1.发函催告2.预期告警) */
     private String messageClassification;
 }

purchase-system/src/main/java/com/ozs/home/mapper/HomeNotificationMessageMapper.java

@@ -2,14 +2,17 @@ package com.ozs.home.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.home.domain.HomeNotificationMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 首页通知消息 数据层
+ * 政策法规Mapper接口
  *
- * @author bu
+ * @author ruoyi
+ * @date 2023-01-14
  */
 @Mapper
-public interface HomeNotificationMessageMapper extends BaseMapper<HomeNotificationMessage> {
+public interface HomeNotificationMessageMapper extends BaseMapper<HomeNotificationMessage>
+{
 }

purchase-system/src/main/java/com/ozs/home/service/HomeNotificationMessageService.java

@@ -1,14 +1,12 @@
 package com.ozs.home.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.home.domain.HomeNotice;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.home.domain.HomeNotificationMessage;
 
+
 /**
- * 首页通知消息 服务层
- *
- * @author bu
+ * @author Administrator
  */
 public interface HomeNotificationMessageService extends IService<HomeNotificationMessage> {
 }

purchase-system/src/main/java/com/ozs/home/service/impl/HomeNotificationMessageServiceImpl.java

@@ -1,21 +1,17 @@
 package com.ozs.home.service.impl;
 
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.home.domain.HomeNotice;
 import com.ozs.home.domain.HomeNotificationMessage;
-import com.ozs.home.mapper.HomeNoticeMapper;
 import com.ozs.home.mapper.HomeNotificationMessageMapper;
-import com.ozs.home.service.HomeNoticeService;
 import com.ozs.home.service.HomeNotificationMessageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
- * @author buzhanyi
+ * @author Administrator
  */
 @Service
 @Slf4j
 public class HomeNotificationMessageServiceImpl extends ServiceImpl<HomeNotificationMessageMapper, HomeNotificationMessage> implements HomeNotificationMessageService {
-    
+
 }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -17,9 +17,9 @@ import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
-import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.mapper.PlanQuarterMapper;
+import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
@@ -54,6 +54,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     @Autowired
     PlanQuarterMapper planQuarterMapper;
     @Autowired
+    PlanYearsMapper planYearsMapper;
+    @Autowired
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -315,18 +317,21 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (planQuarterMapper.countProjectName(ofYear.getProjectName()) == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
-                    if (StringUtils.isNotNull(info)) {
+                    if (!ObjectUtils.isEmpty(info)) {
                         ofYear.setPurchaseDeptId(info.getDeptId());
+                    } else {
+                        ++failureNum;
+                        failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofYear.getProjectAttr().contains("，")) {
-                        String[] split = ofYear.getProjectAttr().split("，");
+                    if (ofYear.getProjectAttr().contains(",")) {
+                        String[] split = ofYear.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
@@ -349,11 +354,11 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("*" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
+                    failureMsg.append(failureNum + "*项目 " + ofYear.getProjectName() + " 已存在！/n");
                 }
             } catch (Exception exc) {
                 failureNum++;
-                String msg = "*" + successNum + "、项目 " + ofYear.getProjectName() + " 导入失败";
+                String msg = "*" + successNum + "*项目 " + ofYear.getProjectName() + " 导入失败";
                 failureMsg.append(msg + exc.getMessage());
                 log.error(msg, exc);
             }
@@ -404,6 +409,13 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     public AjaxResult reviewTo(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
         BeanUtils.copyProperties(vo, quarters);
+        PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
+        if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
+            PlanYears ofYears = new PlanYears();
+            BeanUtils.copyProperties(vo, ofYears);
+            planYearsMapper.insertPlanYears(ofYears);
+            quarters.setPlanYearId(ofYears.getPlanYearId());
+        }
         quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(vo, quarters);
     }
@@ -532,11 +544,11 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
             //项目属性是拼接的
             if (planYear.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split("，");
+                String[] split = planYear.getProjectAttr().split(",");
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + "，");
+                            builder.append(entry.getKey() + ",");
                             break;
                         }
                     }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -27,9 +27,11 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
+import com.ozs.plan.mapper.PlanQuarterMapper;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.PmDemand;
@@ -78,6 +80,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Autowired
     PlanYearsMapper planYearsMapper;
     @Autowired
+    PlanQuarterMapper planQuarterMapper;
+    @Autowired
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -317,6 +321,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
+    @Transactional
     @Override
     public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
@@ -347,18 +352,21 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (planYearsMapper.countProjectName(ofYear.getProjectName()) == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
-                    if (StringUtils.isNotNull(info)) {
+                    if (!ObjectUtils.isEmpty(info)) {
                         ofYear.setPurchaseDeptId(info.getDeptId());
+                    } else {
+                        ++failureNum;
+                        failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofYear.getProjectAttr().contains("，")) {
-                        String[] split = ofYear.getProjectAttr().split("，");
+                    if (ofYear.getProjectAttr().contains(",")) {
+                        String[] split = ofYear.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
@@ -381,11 +389,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("*" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
+                    failureMsg.append(failureNum + "*项目 " + ofYear.getProjectName() + " 已存在！/n");
                 }
             } catch (Exception exc) {
                 failureNum++;
-                String msg = "*" + successNum + "、项目 " + ofYear.getProjectName() + " 导入失败";
+                String msg = "*" + successNum + "*项目 " + ofYear.getProjectName() + " 导入失败";
                 failureMsg.append(msg + exc.getMessage());
                 log.error(msg, exc);
             }
@@ -436,6 +444,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         BeanUtils.copyProperties(vo, ofYears);
+        //年度计划审核通过后同步到季度计划
+        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
+        PlanQuarter quarters = new PlanQuarter();
+        BeanUtils.copyProperties(byId, quarters);
+        planQuarterMapper.insertPlanQuarter(quarters);
         ofYears.setPlanYearId(vo.getPlanYearId());
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(vo, ofYears);
@@ -596,7 +609,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
                         .in("project_status",PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(),PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
@@ -665,7 +678,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
                         .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),PmProjectStatus.BID_INFO_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
@@ -694,7 +707,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
                         .in("project_status",PmProjectStatus.BID_INFO_WAIT_FILL.getCode(),PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
@@ -723,7 +736,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
                         .lt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
@@ -752,7 +765,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
                         .gt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
@@ -817,11 +830,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             //项目属性是拼接的
             if (planYear.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split("，");
+                String[] split = planYear.getProjectAttr().split(",");
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + "，");
+                            builder.append(entry.getKey() + ",");
                             break;
                         }
                     }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemand.java

@@ -2,6 +2,9 @@ package com.ozs.pm.doman;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
@@ -27,6 +30,7 @@ public class PmDemand extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @TableId(type = IdType.AUTO)
     private Long demandId;
 
     /** 计划ID */

purchase-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -222,7 +222,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public void checkUserAllowed(SysUser user)
     {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+        if (StringUtils.isNotNull(user.getUserId()) && "1".equals(user.getUserId().toString()))
         {
             throw new ServiceException("不允许操作超级管理员用户");
         }
@@ -462,7 +462,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     {
         for (Long userId : userIds)
         {
-//            checkUserAllowed(new SysUser(userId));
+            checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
         }
         // 删除用户与角色关联

purchase-system/src/main/resources/mapper/plan/PlanQuarterMapper.xml

@@ -76,7 +76,7 @@
 			and plan_type=0
 			and del_flay=0
 		</where>
-		order by create_time desc
+		order by plan_demand_sub_time desc
 	</select>
 
 	<select id="selectPlanQuarterExamineList" parameterType="com.ozs.plan.doman.PlanQuarter"
@@ -107,7 +107,7 @@
 			and plan_type=0
 			and del_flay=0
 		</where>
-		order by create_time desc
+		order by plan_demand_sub_time desc
 	</select>
 
 	<select id="countProjectName" resultType="java.lang.Integer" parameterType="java.lang.String">