提交代码 evaluation_dept_business_content 删除dept_code

ims-service/ims-eval/src/main/java/com/ims/eval/service/ICalculateIndicatorItemInfoService.java

@@ -17,7 +17,6 @@ import java.util.List;
  */
 public interface ICalculateIndicatorItemInfoService extends IService<CalculateIndicatorItemInfo> {
 
-	int saveIndicatorInfo(List<OrganizationEvaluationInfo> organizationEvaluationInfos) throws Exception;
 
 	int saveIndicatorInfoDTO(List<OrganizationEvaluationInfoResDTO> infoResDTOS) throws Exception;
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/CalculateIndicatorItemInfoServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -31,13 +32,13 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 
 
 
-	@Autowired
+	@Resource
 	private OrganizationEvaluationMapper organizationEvaluationMapper;
 
-	@Autowired
+	@Resource
 	private CalculateIndicatorItemInfoMapper calculateIndicatorItemInfoMapper;
 
-	@Autowired
+	@Resource
 	private IndicatorMapper indicatorMapper;
 
 
@@ -57,10 +58,10 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 					calculateIndicatorItemInfo.setOptionCode(r.getOptionCode());
 					calculateIndicatorItemInfo.setQuantifiedValue(r.getQuantifiedValue());
 					calculateIndicatorItemInfo.setSectionId(r.getBinSection());
-//					calculateIndicatorItemInfo.setOrganizationType(organizationEvaluationResDTO.getOrganizationType());
-//					calculateIndicatorItemInfo.setCheckCycle(organizationEvaluationResDTO.getCheckCycle());
-//					calculateIndicatorItemInfo.setYear(organizationEvaluationResDTO.getYear());
-//					calculateIndicatorItemInfo.setMonth(organizationEvaluationResDTO.getMonth());
+					calculateIndicatorItemInfo.setOrganizationType(organizationEvaluationResDTO.getOrganizationType());
+					calculateIndicatorItemInfo.setCheckCycle(organizationEvaluationResDTO.getCheckCycle());
+					calculateIndicatorItemInfo.setYear(organizationEvaluationResDTO.getYear());
+					calculateIndicatorItemInfo.setMonth(organizationEvaluationResDTO.getMonth());
 					calculateIndicatorItemInfo.setOrganizationEvaluationId(r.getOrganizationEvaluationId());
 					calculateIndicatorItemInfo.setChildCode(r.getChildCode());
 					list.add(calculateIndicatorItemInfo);

ims-service/ims-eval/src/main/resources/mappers/EvaluationDeptBusinessContentMapper.xml

@@ -32,7 +32,6 @@
                business_plan_id,
                dept_id,
                dept_name,
-               dept_code,
                serial_number,
                target_name,
                target_value,