导入问题修改

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorAssessmentController.java

@@ -105,7 +105,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	 * @return 结果
 	 */
 	@PostMapping(value = "/import")
-	public R importData(@RequestParam("file") MultipartFile file, @RequestParam("id") String id) {
+	public R importData(@RequestParam("file") MultipartFile file, @RequestParam("id") String id, @RequestParam("year") String year) {
 		if (!file.isEmpty()) {
 			try {
 				//获取原始的文件名
@@ -129,7 +129,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 					evaluationDeptBusinessContent.setEvaluationScore(str[8]);
 					evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
 				}
-				boolean b = evaluationDeptBusinessContentService.importAssessmentDataList(evaluationDeptBusinessContentList);
+				boolean b = evaluationDeptBusinessContentService.importAssessmentDataList(evaluationDeptBusinessContentList,year);
 				if (b) {
 					return R.ok().data(b);
 				} else {
@@ -320,25 +320,25 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 			qw.lambda().eq(EvaluationDeptBusinessContent::getBusinessPlanId, id);
 		}
 		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.list(qw);
-		if ("23031009".equals(deptId)) {//组织人事部
-			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
-					b = false;
-					msg = "数据审核状态未通过！";
-					break;
-				}
-			}
-		} else {
-			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-				if (evaluationDeptBusinessContent.getDeptId().equals(deptId)) {
-					if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
-						b = false;
-						msg = "数据审核状态未通过，请联系相关部门进行审核！";
-						break;
-					}
-				}
-			}
-		}
+//		if ("23031009".equals(deptId)) {//组织人事部
+//			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+//				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
+//					b = false;
+//					msg = "数据审核状态未通过！";
+//					break;
+//				}
+//			}
+//		} else {
+//			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+//				if (evaluationDeptBusinessContent.getDeptId().equals(deptId)) {
+//					if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
+//						b = false;
+//						msg = "数据审核状态未通过，请联系相关部门进行审核！";
+//						break;
+//					}
+//				}
+//			}
+//		}
 		if (b) {
 			return R.ok().data(b);
 		} else {

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

@@ -23,5 +23,5 @@ public interface IEvaluationDeptBusinessContentService extends IService<Evaluati
 
 	boolean importPlanDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
 
-	boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
+	boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList,String year);
 }

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

@@ -72,7 +72,7 @@ public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<Eva
 	public boolean editState(String id, String state, String instId) {
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
-			if ("组织人事部领导审核".equals(state)) {
+			if ("组织人事部领导审核".equals(state)||"组织人事部审核".equals(state)) {
 				state = "流程已结束";
 			}
 			evaluationDeptBusinessAssessment.setStage(state);

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

@@ -16,6 +16,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author hlf
@@ -109,7 +110,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 	}
 
 	@Override
-	public boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
+	public boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList,String year) {
 		List<EvaluationDeptBusinessContent> list = new ArrayList<>();
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
@@ -120,6 +121,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 				qw.lambda().eq(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
 			}
 			List<EvaluationDeptBusinessContent> objList = super.list(qw);
+//			List<EvaluationDeptBusinessContent> collect = objList.stream().filter(ye -> ye.getRemark().equals(year)).collect(Collectors.toList());
 			if (objList.size() == 1) {//修改
 				evaluationDeptBusinessContent.setId(objList.get(0).getId());
 				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());

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

@@ -116,7 +116,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	public boolean editState(String id, String state, String instId) {
 		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
-			if ("组织人事部领导审核".equals(state)) {
+			if ("组织人事部领导审核".equals(state)||"组织人事部审核".equals(state)) {
 				state = "流程已结束";
 				EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
 				evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());

ims-service/ims-eval/src/main/java/com/ims/eval/util/ExcelUtil.java

@@ -96,8 +96,11 @@ public class ExcelUtil {
                                 break;
                             case HSSFCell.CELL_TYPE_FORMULA:
                                 // 导入时如果为公式生成的数据则无值
-                                if (!cell.getStringCellValue().equals("")) {
-                                    value = cell.getStringCellValue();
+//                                if (!cell.getStringCellValue().equals("")) {
+//								value = cell.getStringCellValue();
+								if (!cell.getCellFormula().equals("")) {
+//									value = cell.getCellFormula();
+									value = cell.getNumericCellValue() + "";
                                 } else {
                                     value = cell.getNumericCellValue() + "";
                                 }

ims-service/pom.xml

@@ -36,11 +36,11 @@
             <artifactId>ims-core</artifactId>
             <version>${ims.core.version}</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>com.ims</groupId>
             <artifactId>ims-mybatis-config-starter</artifactId>
             <version>1.0</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.ims.system</groupId>

pom.xml

@@ -191,12 +191,12 @@
                                 <goal>run</goal>
                             </goals>
                             <configuration>
-                                <tasks>
-                                    <!--suppress UnresolvedMavenProperty -->
+                                <!--<tasks>
+                                    &lt;!&ndash;suppress UnresolvedMavenProperty &ndash;&gt;
                                     <copy overwrite="true"
                                           tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
                                           file="${project.build.directory}/${project.artifactId}.jar" />
-                                </tasks>
+                                </tasks>-->
                             </configuration>
                         </execution>
                     </executions>
@@ -237,26 +237,26 @@
         <!--                <enabled>false</enabled>-->
         <!--            </snapshots>-->
         <!--        </repository>-->
-        <repository>
+        <!--<repository>
             <id>localrepo</id>
             <name>Local Repository</name>
             <url>file://D:\java\maven\repository-gddl</url>
-        </repository>
-        <repository>
+        </repository>-->
+        <!--<repository>
             <id>aliyun-repos</id>
             <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
-        <repository>
+        </repository>-->
+        <!--<repository>
             <id>blade-release</id>
             <name>Release Repository</name>
             <url>http://nexus.bladex.vip/repository/maven-releases/</url>
-        </repository>
+        </repository>-->
     </repositories>
 
-    <pluginRepositories>
+    <!--<pluginRepositories>
         <pluginRepository>
             <id>aliyun-plugin</id>
             <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
@@ -264,6 +264,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
-    </pluginRepositories>
+    </pluginRepositories>-->
 
 </project>