添加审核单位查询和申请修改接口

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

@@ -41,6 +41,14 @@ public class PlanYearsController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "审核单位查询年度计划")
+    @PostMapping("/examineList")
+    public TableDataInfo examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        startPage();
+        List<PlanYears> list = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        return getDataTable(list);
+    }
+
     @ApiOperation(value = "创建年度计划")
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
@@ -89,6 +97,12 @@ public class PlanYearsController extends BaseController {
         return planYearsService.reviewReturn(yearsStandardVo);
     }
 
+    @ApiOperation(value = "申请修改年度计划")
+    @PostMapping("/appUpdate")
+    public AjaxResult appUpdate(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.reviewReturn(yearsStandardVo);
+    }
+
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -24,8 +24,10 @@ public class PlanYears extends BaseEntity {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    @Excel(name = "采购单位")
     private Long purchaseDeptId;
+
+    @Excel(name = "采购单位")
+    private String purchaseDeptName;
     /**
      * 项目名称
      */

purchase-system/src/main/java/com/ozs/plan/mapper/PlanYearsMapper.java

@@ -23,6 +23,14 @@ public interface PlanYearsMapper {
      */
     public List<PlanYears> selectPlanYearsList(PlanYears planYears);
 
+    /**
+     * 查询年度计划记录集合(审核单位)
+     *
+     * @param planYears 年度计划请求对象
+     * @return 年度计划记录集合
+     */
+    public List<PlanYears> selectPlanYearsExamineList(PlanYears planYears);
+
     /**
      * 创建年度计划
      *

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

@@ -23,6 +23,14 @@ public interface PlanYearsService {
      */
     public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
 
+    /**
+     * 查询年度计划记录集合
+     *
+     * @param vo 年度计划请求对象
+     * @return 年度计划记录集合
+     */
+    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
+
     /**
      * 创建年度计划
      *
@@ -92,4 +100,12 @@ public interface PlanYearsService {
      * @return 结果
      */
     public AjaxResult reviewReturn(PlanYearsStandardVo yearsStandardVo);
+
+    /**
+     * 申请修改年度计划
+     *
+     * @param yearsStandardVo 需要审核的年度计划
+     * @return 结果
+     */
+    public AjaxResult appUpdate(PlanYearsStandardVo yearsStandardVo);
 }

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

@@ -8,12 +8,13 @@ import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
-import com.ozs.common.utils.bean.BeanValidators;
 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.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
+import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.impl.SysUserServiceImpl;
 import org.slf4j.Logger;
@@ -42,6 +43,8 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
+    @Autowired
+    private ISysDeptService deptService;
 
     @Override
     public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
@@ -50,6 +53,27 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         try {
             BeanUtils.copyProperties(vo, ofYears);
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
+            for (PlanYears planYear : planYears) {
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+                planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return planYears;
+    }
+
+    @Override
+    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
+        List<PlanYears> planYears = new ArrayList<>();
+        try {
+            BeanUtils.copyProperties(vo, ofYears);
+            planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
+            for (PlanYears planYear : planYears) {
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+                planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -125,6 +149,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         HashMap<String, String> planPurchaseModesMap = planEnums.get("PlanPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("ProjectAttributes");
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
+        //deptService.se
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -139,9 +164,17 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
-                    ofYear.setProjectAtt(projectAttributes.get(ofYear.getProjectAtt()));
+                    //项目属性是多选字段
+                    String[] split = ofYear.getProjectAtt().split("，");
+                    StringBuilder builder = new StringBuilder();
+                    if (split.length > 1) {
+                        for (String s : split) {
+                            builder.append(projectAttributes.get(s) + "，");
+                        }
+                    }
+                    ofYear.setProjectAtt(builder.toString());
                     ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
-                    ofYear.setCreateBy(String.valueOf(loginUser.getUserId()));
+                    ofYear.setCreated(String.valueOf(loginUser.getUserId()));
                     ofYear.setCreateTime(new Date());
                     //采购单位
                     planYearsMapper.insertPlanYears(ofYear);
@@ -150,7 +183,6 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                     //} else if (isUpdateSupport) {
                     //    PlanYears years = plan.get(0);
                     //    BeanValidators.validateWithException(validator, ofYear);
-                    //    years.setCreateBy(operName);
                     //    years.setCreateTime(new Date());
                     //    years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     //    planYearsMapper.updateById(years);
@@ -232,6 +264,19 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult appUpdate(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
+        BeanUtils.copyProperties(vo, ofYears);
+        //申请后会成为未提交的状态，可以进行修改
+        ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planYearsMapper.review(ofYears);
+        if (review != 1) {
+            return AjaxResult.error("项目状态数据异常");
+        }
+        return AjaxResult.success();
+    }
+
     //判断是否为超额计划
     public String isExcessOrNo(String projectType, BigDecimal evaluation) {
         BigDecimal threshold = new BigDecimal(0);

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

@@ -75,6 +75,35 @@
 		order by create_time desc
 	</select>
 
+	<select id="selectPlanYearsExamineList" parameterType="com.ozs.plan.doman.PlanYears" resultMap="PlanYearsResult">
+		select * from plan_years
+		<where>
+			<if test="projectName != null and projectName != ''">
+				AND project_name like concat('%', #{projectName}, '%')
+			</if>
+			<if test="purchaseServices != null and purchaseServices != ''">
+				AND purchase_services = #{purchaseServices}
+			</if>
+			<if test="isExcess != null and isExcess != ''">
+				AND is_excess = #{isExcess}
+			</if>
+			<if test="projectStatus == null or projectStatus ==''">
+				AND project_status in (1,3)
+			</if>
+			<if test="projectStatus != null and projectStatus != ''">
+				AND project_status = #{projectStatus}
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+			and del_flay=0
+		</where>
+		order by create_time desc
+	</select>
+
 	<select id="countProjectName" resultType="com.ozs.plan.doman.PlanYears" parameterType="java.lang.String">
 		select *
 		from plan_years