新增数据项的审核意见

src/main/java/com/keymobile/indicators/api/hytobacco/IndicatorsDefAuditCtrl.java

@@ -66,4 +66,9 @@ public class IndicatorsDefAuditCtrl {
 	public String getAuditCount(@RequestParam Integer status){
 		return indicatorsDefAuditService.getAuditCount(status);
 	}
+	@ApiOperation(value = "获取审核意见")
+	@GetMapping("/findAuditRecord")
+	public List<BaseIndDefRecord> findAuditRecord(@RequestParam String indId){
+		return indicatorsDefAuditService.findAuditRecord(indId);
+	}
 }

src/main/java/com/keymobile/indicators/model/mapper/indicators/BaseIndDefRecordMapper.java

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.indicators.BaseIndDefRecord;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+/**
+ * TODO
+ *
+ * @author hzc
+ * @version 1.0
+ * @date 2021/2/26
+ */
+@Mapper
+public interface BaseIndDefRecordMapper extends BaseMapper<BaseIndDefRecord> {
+}

src/main/java/com/keymobile/indicators/service/hytobacco/IndicatorsDefAuditService.java

@@ -3,7 +3,9 @@ package com.keymobile.indicators.service.hytobacco;
 import com.keymobile.indicators.model.entity.indicators.BaseIndDef;
 import com.keymobile.indicators.model.entity.indicators.BaseIndDefAudit;
 import com.keymobile.indicators.model.entity.indicators.BaseIndDefAuditParams;
+import com.keymobile.indicators.model.entity.indicators.BaseIndDefRecord;
 import com.keymobile.indicators.model.mapper.indicators.BaseIndDefMapper;
+import com.keymobile.indicators.model.mapper.indicators.BaseIndDefRecordMapper;
 import com.keymobile.indicators.model.mapper.indmapper.IndicatorsDefAuditMapper;
 import com.keymobile.indicators.result.Result;
 import com.keymobile.indicators.utils.CalculateUtils;
@@ -34,6 +36,8 @@ public class IndicatorsDefAuditService {
     @Autowired
     private BaseIndDefMapper baseIndDefMapper;
 
+    @Autowired
+    private BaseIndDefRecordMapper baseIndDefRecordMapper;
     public Result addAplay(BaseIndDefAudit baseIndDefAudit) {
 
         List<BaseIndDef> baseIndDefs = baseIndDefMapper.selectByCatalogIdAndIndName(baseIndDefAudit.getCatalogId(), baseIndDefAudit.getIndName());
@@ -94,6 +98,7 @@ public class IndicatorsDefAuditService {
 
     //审核数据---当审核通过时录入结果表
     public Result auditData(String indId, Integer status, String msg) {
+
         BaseIndDefAudit baseIndDefAudit = new BaseIndDefAudit();
         Date date = new Date();
         String currentUser = SystemUserUtil.getCurrentUser();
@@ -110,8 +115,17 @@ public class IndicatorsDefAuditService {
             baseIndDef.setVersion("1.0");
             baseIndDefMapper.insert(baseIndDef);
         }
+        if(status.equals(3)||status.equals(4)){
+            //保存审核记录
+            BaseIndDefRecord baseIndDefRecord = new BaseIndDefRecord();
+            baseIndDefRecord.setCreateTime(date);
+            baseIndDefRecord.setCreateUser(currentUser);
+            baseIndDefRecord.setDescription(msg);
+            baseIndDefRecord.setIndId(indId);
+            baseIndDefRecord.setStatus(status);
+            baseIndDefRecordMapper.insert(baseIndDefRecord);
+        }
         return Result.genOkResult();
-
     }
 
     /**
@@ -126,4 +140,11 @@ public class IndicatorsDefAuditService {
         int row = indicatorsDefAuditMapper.selectCount(baseIndDefAudit);
         return String.valueOf(row);
     }
+
+    //通过id获取审核记录（意见）
+    public List<BaseIndDefRecord> findAuditRecord(String indId) {
+        BaseIndDefRecord baseIndDefRecord = new BaseIndDefRecord();
+        baseIndDefRecord.setIndId(indId);
+        return baseIndDefRecordMapper.select(baseIndDefRecord);
+    }
 }