77

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertController.java

@@ -5,6 +5,7 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.annotation.Logs;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.entity.ComExpert;
+import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComExpertDTO;
@@ -117,15 +118,27 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
         if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
             dto.setUnitId(SecurityUserHolder.getUnitId());
             ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
-            dto.setUnitName(comUnitDTO.getUnitName());
+            dto.setWorkUnit(comUnitDTO.getUnitName());
+            if (Objects.isNull(dto.getReportState())) {
+                dto.setReportState(1);
+            }
         } else {
             if (Objects.nonNull(dto.getTreeCode())) {
                 ComUnitDTO unit = comUnitService.getByTreeCode(dto.getTreeCode());
                 if (null != unit) {
                     dto.setUnitId(unit.getId());
-                    dto.setUnitName(unit.getUnitName());
+                    dto.setWorkUnit(unit.getUnitName());
+                }
+            }else {
+                ComUnit comUnit = comUnitService.isExist(dto.getWorkUnit());
+                if (null != comUnit){
+                    dto.setUnitId(comUnit.getId());
+                    dto.setWorkUnit(comUnit.getUnitName());
                 }
             }
+            if (Objects.isNull(dto.getReportState())) {
+                dto.setReportState(2);
+            }
         }
     }
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComBatchServiceImpl.java

@@ -229,7 +229,7 @@ public class ComBatchServiceImpl extends BaseServiceImpl<ComBatchDAO, ComBatchQu
 
     private String judgementDateTimeStr(Date currentDate, Date startDate, Date endDate, int Batch, Integer year) {
         String result = "";
-        SimpleDateFormat time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat time = new SimpleDateFormat("yyyy-MM-dd");
         String start = time.format(startDate);
         String end = time.format(endDate);
         if (currentDate.before(startDate)) {

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -132,9 +132,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
                 throw new BusinessException("该手机号已注册，请检查后再试！");
             comPerson = new ComPerson();
             StringUtil.copyObj2Obj(dto, comPerson);
-            ComUnit comUnit = comUnitService.isExist(dto.getUnitName());
-            if (null != comUnit)
-                comPerson.setUnitId(comUnit.getId());
+
             comPerson.setPersonState(CommonEnum.personState.normal.getCode());
             personId = comPersonService.insert(comPerson);
             String pwd = dto.getCertId().substring(dto.getCertId().length() - 6).toLowerCase();
@@ -145,6 +143,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
         comExpert.setPersonId(personId);
         comExpert.setRemark(dto.getRemark());
         comExpert.setExpertState(CommonEnum.loginState.start.getCode());
+        comExpert.setReportState(dto.getReportState());
         String id = this.insert(comExpert);
         dto.setId(comExpert.getId());
         comExpertSpecService.insertSpecList(dto.getAuditSpecList(), id);
@@ -197,7 +196,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
             //职称
             List<SystemParameter> titleList = systemParameterService.getListByType(7);
             //专业学科
-            List<SystemParameter> specList = systemParameterService.getListByType(42);
+            List<SystemParameter> specList = systemParameterService.getListByType(57);
             list.forEach(e -> {
                 if (null != comPersonService.getPersonByCertId(e.getCertId()))
                     return;
@@ -214,10 +213,8 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
                         e.setAuditSpecList(audtiSpecList);
                     }
                 }
-
                 insert(e);
             });
-
             return "专家导入成功！";
         } catch (Exception e) {
             throw new BusinessException(e.getMessage());