77

science-admin/src/main/java/com/yiboshi/science/param/dto/ComExpertDTO.java

@@ -75,6 +75,12 @@ public class ComExpertDTO extends BaseDTO {
     /** 学位 */
     @ApiModelProperty(value = "学位", position = 14)
     private String degreeName;
+    /** 学历 */
+    @ApiModelProperty(value = "学历", position = 10)
+    private String education;
+    /** 学历 */
+    @ApiModelProperty(value = "学历", position = 35)
+    private String educationName;
     /** 邮箱 */
     @ApiModelProperty(value = "邮箱", position = 15)
     private String email;

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

@@ -167,7 +167,12 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
     @RequestMapping("/expertImport")
     @PostMapping
     public ResponseDataModel<String> expertImport(@Validated @RequestBody List<ComExpertDTO> list) {
-        return ResponseDataModel.ok(comExpertService.expertImport(list));
+        String unitName="";
+        ComUnit unit = comUnitService.getById(SecurityUserHolder.getUnitId());
+        if (null != unit) {
+            unitName=unit.getUnitName();
+        }
+        return ResponseDataModel.ok(comExpertService.expertImport(list,unitName));
     }
 
     @ApiOperation(value = "验证证件号是否存在", httpMethod = "GET", notes = "验证证件号是否存在")

science-admin/src/main/java/com/yiboshi/science/service/ComExpertService.java

@@ -54,7 +54,7 @@ public interface ComExpertService extends BaseService<ComExpertQueryVO, ComExper
      * @param list
      * @return
      */
-    String expertImport(List<ComExpertDTO> list);
+    String expertImport(List<ComExpertDTO> list,String unitName);
 
     /**
      * 验证专家是否存在

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
+import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComExpertDAO;
 import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
@@ -191,12 +192,14 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
         return id;
     }
 
-    public String expertImport(List<ComExpertDTO> list) {
+    public String expertImport(List<ComExpertDTO> list,String unitName) {
         try {
             //职称
             List<SystemParameter> titleList = systemParameterService.getListByType(7);
             //专业学科
             List<SystemParameter> specList = systemParameterService.getListByType(68);
+            //专业学科
+            List<SystemParameter> educationList = systemParameterService.getListByType(8);
             list.forEach(e -> {
                 if (null != comPersonService.getPersonByCertId(e.getCertId()))
                     return;
@@ -205,6 +208,11 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
                     if (findList1.size() > 0)
                         e.setTitle(findList1.stream().findFirst().get().getId());
                 }
+                if (null != e.getEducationName()) {
+                    List<SystemParameter> findList1 = educationList.stream().filter(p -> e.getEducationName().equals(p.getName())).collect(Collectors.toList());
+                    if (findList1.size() > 0)
+                        e.setEducation(findList1.stream().findFirst().get().getId());
+                }
                 if (null != e.getSpecName()) {
                     List<SystemParameter> findList2 = specList.stream().filter(p -> e.getSpecName().equals(p.getName())).collect(Collectors.toList());
                     if (findList2.size() > 0) {
@@ -215,7 +223,14 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
                         e.setSpecList(audtiSpecList);
                     }
                 }
-                e.setWorkUnit(e.getUnitName());
+                if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
+                    e.setUnitId(SecurityUserHolder.getUnitId());
+                    e.setWorkUnit(unitName);
+                    e.setReportState(1);
+                }else{
+                    e.setWorkUnit(e.getUnitName());
+                    e.setReportState(2);
+                }
                 insert(e);
             });
             return "专家导入成功！";

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

@@ -197,18 +197,13 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
     }
 
     @Transactional
-    public String audit(ComUnitDTO unit) {
-        ComUnit comUnit = this.entityById(unit.getId());
-        if (comUnit == null) {
-            throw new BusinessException("单位不存在或已删除");
-        }
-        if (null == comUnit.getAuditResult()) {
-            throw new BusinessException("单位状态不允许审核");
+    public String audit(ComUnitDTO dto) {
+        ComUnit comUnit = this.entityById(dto.getId());
+        if (comUnit == null||Objects.isNull(comUnit.getAuditResult())) {
+            throw new BusinessException("单位不存在或当前状态不允许审核！");
         }
-        comUnit = this.convert2Entity(unit);
-        comUnit.setUnitState(unit.getAuditResult().equals(10) ? CommonEnum.unitState.normal.getCode() : CommonEnum.unitState.cancel.getCode());
         List<ComPersonDTO> list = comManagerService.getManagerListByUnitId(comUnit.getId());
-        if (unit.getAuditResult().equals(10)) {
+        if (dto.getAuditResult().equals(10)) {
             if (comUnit.getAuditResult().equals(1)) {
                 for (ComPersonDTO e : list) {
                     if (Objects.nonNull(e.getMobile())) {
@@ -221,18 +216,20 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
             if (comUnit.getAuditResult().equals(1)) {
                 for (ComPersonDTO e : list) {
                     if (Objects.nonNull(e.getMobile())) {
-                        this.SMSSending(e.getMobile(), e.getPersonName(), properties.getSystemName(), "单位", "审核不通过" + "(" + unit.getAuditContent() + ")", "请联系上级主管部门处理");
+                        this.SMSSending(e.getMobile(), e.getPersonName(), properties.getSystemName(), "单位", "审核不通过" + "(" + dto.getAuditContent() + ")", "请联系上级主管部门处理");
                         break;
                     }
                 }
             }
         }
+        comUnit = this.convert2Entity(dto);
+        comUnit.setUnitState(dto.getAuditResult().equals(10) ? CommonEnum.unitState.normal.getCode() : CommonEnum.unitState.cancel.getCode());
         comUnit.setAuditDate(new Date());
         comUnit.setAuditPerson(SecurityUserHolder.getPersonId());
         comUnit.setAuditUnit(SecurityUserHolder.getUnitId());
         this.update(comUnit);
         refreshRedis();
-        return unit.getId();
+        return dto.getId();
     }
 
     private void SMSSending(String mobile, String name, String systemName, String userType, String result, String message) {

science-admin/src/main/resources/mapper/ComExpertDAO.xml

@@ -29,13 +29,14 @@
         ORDER BY d.tree_code ASC
     </select>
     <select id="getExpertById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComExpertDTO">
-        SELECT x.*,a.person_name,a.cert_id,a.sex,a.birthday,a.mobile,a.email,a.education,a.title,a.unit_id,a.work_unit
-               ,b.tree_code,b.unit_name,d.name education_name,e.name title_name
+        SELECT x.*,a.person_name,a.cert_id,a.sex,a.birthday,a.mobile,a.email,a.education,a.title,a.unit_id,a.work_unit,a.degree
+               ,b.tree_code,b.unit_name,d.name education_name,e.name title_name,f.name degree_name
         FROM com_expert x
         LEFT JOIN com_person a ON x.person_id = a.id
         LEFT JOIN com_unit b ON a.unit_id = b.id
         left join system_parameter d on a.education=d.id and d.type_id=8
         left join system_parameter e on a.title=e.id and e.type_id=7
+        left join system_parameter f on a.degree=f.id and f.type_id=9
         where x.id = #{id}
     </select>
     <select id="getExpertByCertId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComExpertDTO">