lichaoliu 4 жил өмнө
parent
commit
d473d8f0da

+ 1 - 0
src/main/java/com/migao/entity/po/ProjectFile.java

@@ -18,6 +18,7 @@ import javax.persistence.*;
 @Table(name = "t_project_file")
 @org.hibernate.annotations.Table(appliesTo = "t_project_file", comment = "项目合同文件表")
 @TableName("t_project_file")
+
 public class ProjectFile {
 
     @Id

+ 2 - 1
src/main/java/com/migao/mapper/DictionaryMapper.java

@@ -3,11 +3,12 @@ package com.migao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.migao.entity.po.Dictionary;
 import com.migao.entity.vo.res.DictionaryListRes;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface DictionaryMapper extends BaseMapper<Dictionary> {
     void insertAll();
 
-    List<DictionaryListRes> findByValue(String value);
+    List<DictionaryListRes> findByValue(@Param("value") String value);
 }

+ 3 - 3
src/main/java/com/migao/service/impl/ProjectServiceImpl.java

@@ -167,21 +167,21 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public ResponseBean<List<DictionaryListRes>> projectClassify() {
-        String value = "项目分类";
+        String value = "PROJECT_CLASSIFY";
         List<DictionaryListRes> all = dictionaryMapper.findByValue(value);
         return ResponseBuilder.ok(all);
     }
 
     @Override
     public ResponseBean<List<DictionaryListRes>> specialtyClassify() {
-        String value = "项目专业分类";
+        String value = "SPECIALTY_CLASSIFY";
         List<DictionaryListRes> all = dictionaryMapper.findByValue(value);
         return ResponseBuilder.ok(all);
     }
 
     @Override
     public ResponseBean<List<DictionaryListRes>> twoClassify() {
-        String value = "二级分类";
+        String value = "TWO_CLASSIFY";
         List<DictionaryListRes> all = dictionaryMapper.findByValue(value);
         return ResponseBuilder.ok(all);
     }

+ 22 - 0
src/main/java/com/migao/service/impl/PurchasingApprovalServiceImpl.java

@@ -107,6 +107,13 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
         //更新项目状态
         project.setOrderStatus(ProjectStatus.TO_APPROVAL.getName());
         projectMapper.updateById(project);
+        //新增采购记录
+        PurchasingApproval purchasingApproval=new PurchasingApproval();
+        purchasingApproval.setDeleted(0);
+        purchasingApproval.setProjectId(projectId);
+        purchasingApproval.setStatus(ProjectStatus.TO_BE_REPORTED);
+        purchasingApproval.setStage(ProjectStatus.TO_BE_REPORTED.getName());
+        purchasingApprovalMapper.insert(purchasingApproval);
         return ResponseBuilder.ok();
     }
 
@@ -118,6 +125,13 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
         }
         project.setOrderStatus(ProjectStatus.APPROVE.getName());
         projectMapper.updateById(project);
+        //新增采购记录
+        PurchasingApproval purchasingApproval=new PurchasingApproval();
+        purchasingApproval.setDeleted(0);
+        purchasingApproval.setProjectId(id);
+        purchasingApproval.setStatus(ProjectStatus.TO_APPROVAL);
+        purchasingApproval.setStage(ProjectStatus.TO_APPROVAL.getName());
+        purchasingApprovalMapper.insert(purchasingApproval);
         return ResponseBuilder.ok();
     }
 
@@ -159,6 +173,14 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
                 .fileId(fileId)
                 .build();
         projectFileMapper.insert(projectFile);
+
+        //新增采购记录
+        PurchasingApproval purchasingApproval=new PurchasingApproval();
+        purchasingApproval.setDeleted(0);
+        purchasingApproval.setProjectId(projectId);
+
+        purchasingApproval.setStage(ProjectStatus.TO_APPROVAL.getName());
+        purchasingApprovalMapper.insert(purchasingApproval);
         return ResponseBuilder.ok();
     }
 }

+ 1 - 1
src/main/resources/mapper/DictionaryMapper.xml

@@ -12,6 +12,6 @@
     </insert>
     <select id="findByValue" resultType="com.migao.entity.vo.res.DictionaryListRes">
 SELECT * FROM t_dictionary two WHERE
-parent_id=(SELECT id FROM t_dictionary WHERE parent_id='0' AND type='PROJECT_CLASSIFY')
+parent_id=(SELECT id FROM t_dictionary WHERE parent_id='0' AND type=#{value})
     </select>
 </mapper>