企业信息审核

common/src/main/java/com/jpsoft/employment/modules/base/entity/EnterpriseCertificationApprove.java

@@ -20,6 +20,7 @@ public class EnterpriseCertificationApprove {
     private String id;
         @ApiModelProperty(value = "")
     private String createBy;
+    private String createByName;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "")
@@ -34,10 +35,15 @@ public class EnterpriseCertificationApprove {
     private Boolean delFlag;
         @ApiModelProperty(value = "申请认证企业ID")
     private String companyId;
+    private String companyName;
         @ApiModelProperty(value = "审批人")
     private String approvePersonId;
+    private String approvePersonName;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
+
+    private String isCertification;
+    private String isCertificationName;
 }

common/src/main/resources/mapper/base/EnterpriseCertificationApprove.xml

@@ -5,15 +5,17 @@
 <mapper namespace="com.jpsoft.employment.modules.base.dao.EnterpriseCertificationApproveDAO">
 	<resultMap id="EnterpriseCertificationApproveMap" type="com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove">
 		<id property="id" column="id_" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			<result property="companyId" column="company_id" />
-			<result property="approvePersonId" column="approve_person_id" />
-			<result property="approveTime" column="approve_time" />
-			</resultMap>
+		<result property="createBy" column="create_by" />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy" column="update_by" />
+		<result property="updateTime" column="update_time" />
+		<result property="delFlag" column="del_flag" />
+		<result property="companyId" column="company_id" />
+		<result property="approvePersonId" column="approve_person_id" />
+		<result property="approveTime" column="approve_time" />
+
+		<result property="isCertification" column="is_certification" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -86,11 +88,12 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_pers
 
 	<select id="search" parameterType="hashmap" resultMap="EnterpriseCertificationApproveMap">
 		<![CDATA[
-			select * from base_enterprise_certification_approve
+			SELECT a.*,b.is_certification FROM base_enterprise_certification_approve a
+			LEFT JOIN base_company b ON a.company_id = b.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.isCertification != null">
+				and b.is_certification = #{searchParams.isCertification}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -7,6 +7,7 @@ import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.job.entity.JobUser;
 import com.jpsoft.employment.modules.sys.entity.DataDictionary;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
@@ -267,4 +268,61 @@ public class CompanyController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("editChecked/{id}")
+    public MessageResult<Company> editChecked(@PathVariable("id") String id, @RequestAttribute String subject){
+        MessageResult<Company> msgResult = new MessageResult<>();
+
+        try {
+            Company company = companyService.get(id);
+
+            if (company != null) {
+                msgResult.setResult(true);
+                msgResult.setData(company);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("checked")
+    public MessageResult<Company> checked(String id,@RequestAttribute String subject){
+        MessageResult<Company> msgResult = new MessageResult<>();
+
+        try {
+            Company company = companyService.get(id);
+            company.setIsCertification("2");
+            company.setUpdateBy(subject);
+            company.setUpdateTime(new Date());
+
+            int affectCount = companyService.update(company);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(company);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/EnterpriseCertificationApproveController.java

@@ -264,7 +264,7 @@ public class EnterpriseCertificationApproveController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String isCertification,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -277,13 +277,27 @@ public class EnterpriseCertificationApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(isCertification)) {
+            searchParams.put("isCertification",isCertification);
         }
 
         Page<EnterpriseCertificationApprove> page = enterpriseCertificationApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(EnterpriseCertificationApprove enterpriseCertificationApprove : page.getResult()){
+            switch (enterpriseCertificationApprove.getIsCertification()){
+                case "1": enterpriseCertificationApprove.setIsCertificationName("未审批"); break;
+                case "2": enterpriseCertificationApprove.setIsCertificationName("已审批"); break;
+            }
+            User user = userService.get(enterpriseCertificationApprove.getCreateBy());
+            enterpriseCertificationApprove.setCreateByName(user.getRealName());
+            Company company = companyService.get(enterpriseCertificationApprove.getCompanyId());
+            enterpriseCertificationApprove.setCompanyName(company.getName());
+            user = userService.get(enterpriseCertificationApprove.getApprovePersonId());
+            if(user != null){
+                enterpriseCertificationApprove.setApprovePersonName(user.getRealName());
+            }
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));