Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/dao/LabourServicesApproveDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface LabourServicesApproveDAO {
+	int insert(LabourServicesApprove entity);
+	int update(LabourServicesApprove entity);
+	int exist(String id);
+	LabourServicesApprove get(String id);
+	int delete(String id);
+	List<LabourServicesApprove> list();
+	List<LabourServicesApprove> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

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

@@ -0,0 +1,49 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_labour_services_approve的实体类
+ */
+@Data
+@ApiModel(value = "base_labour_services_approve的实体类")
+public class LabourServicesApprove {
+        @ApiModelProperty(value = "")
+    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 = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "劳务对接ID")
+    private String labourServicesId;
+    private String labourServicesName;
+        @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 approvalStatus;
+    private String approvalStatusName;
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/LabourServicesApproveService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface LabourServicesApproveService {
+	LabourServicesApprove get(String id);
+	boolean exist(String id);
+	int insert(LabourServicesApprove model);
+	int update(LabourServicesApprove model);
+	int delete(String id);
+	List<LabourServicesApprove> list();
+	Page<LabourServicesApprove> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesApproveServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.LabourServicesApproveDAO;
+import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import com.jpsoft.employment.modules.base.service.LabourServicesApproveService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="labourServicesApproveService")
+public class LabourServicesApproveServiceImpl implements LabourServicesApproveService {
+	@Resource(name="labourServicesApproveDAO")
+	private LabourServicesApproveDAO labourServicesApproveDAO;
+
+	@Override
+	public LabourServicesApprove get(String id) {
+		// TODO Auto-generated method stub
+		return labourServicesApproveDAO.get(id);
+	}
+
+	@Override
+	public int insert(LabourServicesApprove model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return labourServicesApproveDAO.insert(model);
+	}
+
+	@Override
+	public int update(LabourServicesApprove model) {
+		// TODO Auto-generated method stub
+		return labourServicesApproveDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return labourServicesApproveDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = labourServicesApproveDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<LabourServicesApprove> list() {
+		// TODO Auto-generated method stub
+		return labourServicesApproveDAO.list();
+	}
+		
+	@Override
+	public Page<LabourServicesApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<LabourServicesApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            labourServicesApproveDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/job/entity/JobUser.java

@@ -67,7 +67,7 @@ public class JobUser {
 	private String address;
 
 	@ApiModelProperty(value = "首次参加工作时间")
-	private Date firstJobTime;
+	private String firstJobTime;
 
 	@ApiModelProperty(value = "头像")
 	private String headImageUrl;
@@ -80,6 +80,7 @@ public class JobUser {
 
 	@ApiModelProperty(value = "身份证照片")
 	private String idCardUrl;
+	private String[] idCardUrlArray;
 
 	@ApiModelProperty(value = "工作状态")
 	private String jobStatus;

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.LabourServicesApproveDAO">
+	<resultMap id="LabourServicesApproveMap" type="com.jpsoft.employment.modules.base.entity.LabourServicesApprove">
+		<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="labourServicesId" column="labour_services_id" />
+		<result property="approvePersonId" column="approve_person_id" />
+		<result property="approveTime" column="approve_time" />
+
+		<result property="approvalStatus" column="approval_status" />
+	</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LabourServicesApprove">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_labour_services_approve
+	    (id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{labourServicesId,jdbcType=VARCHAR}
+,#{approvePersonId,jdbcType=VARCHAR}
+,#{approveTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_labour_services_approve where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.LabourServicesApprove">
+		update base_labour_services_approve
+		<set>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="labourServicesId!=null">
+		labour_services_id=#{labourServicesId,jdbcType=VARCHAR},
+		</if>
+				<if test="approvePersonId!=null">
+		approve_person_id=#{approvePersonId,jdbcType=VARCHAR},
+		</if>
+				<if test="approveTime!=null">
+		approve_time=#{approveTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="LabourServicesApproveMap">
+		select 
+id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time		from base_labour_services_approve where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_labour_services_approve where id_=#{0}
+	</select>
+	<select id="list" resultMap="LabourServicesApproveMap">
+		select * from base_labour_services_approve
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="LabourServicesApproveMap">
+		<![CDATA[
+			SELECT a.*,b.approval_status FROM base_labour_services_approve a
+			LEFT JOIN base_labour_services b ON a.labour_services_id = b.id_
+		]]>
+		<where>
+			<if test="searchParams.approvalStatus != null">
+				and b.approval_status = #{searchParams.approvalStatus}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/job/JobUser.xml

@@ -50,7 +50,7 @@
 ,#{sex,jdbcType=VARCHAR}
 ,#{birthday,jdbcType= TIMESTAMP }
 ,#{address,jdbcType=VARCHAR}
-,#{firstJobTime,jdbcType= TIMESTAMP }
+,#{firstJobTime,jdbcType= VARCHAR }
 ,#{headImageUrl,jdbcType=VARCHAR}
 ,#{isAuthentication,jdbcType= VARCHAR }
 ,#{idCard,jdbcType=VARCHAR}
@@ -105,7 +105,7 @@
 		address_=#{address,jdbcType=VARCHAR},
 		</if>
 				<if test="firstJobTime!=null">
-		first_job_time=#{firstJobTime,jdbcType= TIMESTAMP },
+		first_job_time=#{firstJobTime,jdbcType= VARCHAR },
 		</if>
 				<if test="headImageUrl!=null">
 		head_image_url=#{headImageUrl,jdbcType=VARCHAR},

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

@@ -3,7 +3,9 @@ package com.jpsoft.employment.modules.base.controller;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.City;
 import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
 import com.jpsoft.employment.modules.base.service.CompanyService;
+import com.jpsoft.employment.modules.base.service.EnterpriseCertificationApproveService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
@@ -32,6 +34,8 @@ public class CompanyController {
     private DataDictionaryService dataDictionaryService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private EnterpriseCertificationApproveService enterpriseCertificationApproveService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -297,18 +301,25 @@ public class CompanyController {
 
     @ApiOperation(value="更新用户")
     @PostMapping("checked")
-    public MessageResult<Company> checked(String id,@RequestAttribute String subject){
+    public MessageResult<Company> checked(String id,String cid,@RequestAttribute String subject){
         MessageResult<Company> msgResult = new MessageResult<>();
 
         try {
-            Company company = companyService.get(id);
-            company.setIsCertification("2");
-            company.setUpdateBy(subject);
-            company.setUpdateTime(new Date());
+            EnterpriseCertificationApprove enterpriseCertificationApprove = enterpriseCertificationApproveService.get(id);
+            enterpriseCertificationApprove.setApprovePersonId(subject);
+            enterpriseCertificationApprove.setApproveTime(new Date());
+            enterpriseCertificationApprove.setUpdateBy(subject);
+            enterpriseCertificationApprove.setUpdateTime(new Date());
 
-            int affectCount = companyService.update(company);
+            int affectCount = enterpriseCertificationApproveService.update(enterpriseCertificationApprove);
 
             if (affectCount > 0) {
+                Company company = companyService.get(cid);
+                company.setIsCertification("2");
+                company.setUpdateBy(subject);
+                company.setUpdateTime(new Date());
+                companyService.update(company);
+
                 msgResult.setResult(true);
                 msgResult.setData(company);
             } else {

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

@@ -268,10 +268,6 @@ public class EnterpriseCertificationApproveController {
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();

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

@@ -0,0 +1,245 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
+import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.base.service.LabourServicesService;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import com.jpsoft.employment.modules.base.service.LabourServicesApproveService;
+import com.jpsoft.employment.modules.sys.entity.User;
+import com.jpsoft.employment.modules.sys.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/labourServicesApprove")
+@Api(description = "labourServicesApprove")
+public class LabourServicesApproveController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private LabourServicesService labourServicesService;
+    @Autowired
+    private LabourServicesApproveService labourServicesApproveService;
+    @Autowired
+    private UserService userService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<LabourServicesApprove> create(){
+        MessageResult<LabourServicesApprove> msgResult = new MessageResult<>();
+
+        LabourServicesApprove labourServicesApprove = new LabourServicesApprove();
+
+        msgResult.setData(labourServicesApprove);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<LabourServicesApprove> add(@RequestBody LabourServicesApprove labourServicesApprove,@RequestAttribute String subject){
+        MessageResult<LabourServicesApprove> msgResult = new MessageResult<>();
+
+        try {
+            labourServicesApprove.setId(UUID.randomUUID().toString());
+            labourServicesApprove.setDelFlag(false);
+            labourServicesApprove.setCreateBy(subject);
+            labourServicesApprove.setCreateTime(new Date());
+            
+            int affectCount = labourServicesApproveService.insert(labourServicesApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(labourServicesApprove);
+            } 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="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<LabourServicesApprove> edit(@PathVariable("id") String id){
+        MessageResult<LabourServicesApprove> msgResult = new MessageResult<>();
+
+        try {
+            LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+
+            if (labourServicesApprove != null) {
+                msgResult.setResult(true);
+                msgResult.setData(labourServicesApprove);
+            } 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("update")
+    public MessageResult<LabourServicesApprove> update(@RequestBody LabourServicesApprove labourServicesApprove,@RequestAttribute String subject){
+        MessageResult<LabourServicesApprove> msgResult = new MessageResult<>();
+
+        try {
+            labourServicesApprove.setUpdateBy(subject);
+            labourServicesApprove.setUpdateTime(new Date());
+            
+            int affectCount = labourServicesApproveService.update(labourServicesApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(labourServicesApprove);
+            } 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("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+            labourServicesApprove.setDelFlag(true);
+            labourServicesApprove.setUpdateBy(subject);
+            labourServicesApprove.setUpdateTime(new Date());
+
+            int affectCount = labourServicesApproveService.update(labourServicesApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } 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("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+                labourServicesApprove.setDelFlag(true);
+                labourServicesApprove.setUpdateBy(subject);
+                labourServicesApprove.setUpdateTime(new Date());
+
+                affectCount += labourServicesApproveService.update(labourServicesApprove);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } 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="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String approvalStatus,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("a.id_","asc"));
+
+        if (StringUtils.isNotEmpty(approvalStatus)) {
+            searchParams.put("approvalStatus",approvalStatus);
+        }
+
+        Page<LabourServicesApprove> page = labourServicesApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(LabourServicesApprove labourServicesApprove : page.getResult()){
+            switch (labourServicesApprove.getApprovalStatus()){
+                case "1": labourServicesApprove.setApprovalStatusName("未审批"); break;
+                case "2": labourServicesApprove.setApprovalStatusName("已审批"); break;
+            }
+            User user = userService.get(labourServicesApprove.getCreateBy());
+            labourServicesApprove.setCreateByName(user.getRealName());
+            LabourServices labourServices = labourServicesService.get(labourServicesApprove.getLabourServicesId());
+            labourServicesApprove.setLabourServicesName(labourServices.getContent());
+            user = userService.get(labourServicesApprove.getApprovePersonId());
+            if(user != null){
+                labourServicesApprove.setApprovePersonName(user.getRealName());
+            }
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
 import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
+import com.jpsoft.employment.modules.base.service.LabourServicesApproveService;
 import com.jpsoft.employment.modules.base.service.LabourServicesService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -29,7 +33,8 @@ public class LabourServicesController {
 
     @Autowired
     private LabourServicesService labourServicesService;
-
+    @Autowired
+    private LabourServicesApproveService labourServicesApproveService;
     @Autowired
     private DataDictionaryService dataDictionaryService;
 
@@ -277,4 +282,72 @@ public class LabourServicesController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("editChecked/{id}")
+    public MessageResult<LabourServices> editChecked(@PathVariable("id") String id, @RequestAttribute String subject){
+        MessageResult<LabourServices> msgResult = new MessageResult<>();
+
+        try {
+            LabourServices labourServices = labourServicesService.get(id);
+            switch (labourServices.getType()){
+                case "1": labourServices.setTypeN("我要用工人");break;
+                case "2": labourServices.setTypeN("我有工人");break;
+            }
+
+            if (labourServices != null) {
+                msgResult.setResult(true);
+                msgResult.setData(labourServices);
+            } 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<LabourServices> checked(String id,String cid,@RequestAttribute String subject){
+        MessageResult<LabourServices> msgResult = new MessageResult<>();
+
+        try {
+            LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+            labourServicesApprove.setApprovePersonId(subject);
+            labourServicesApprove.setApproveTime(new Date());
+            labourServicesApprove.setUpdateBy(subject);
+            labourServicesApprove.setUpdateTime(new Date());
+
+            int affectCount = labourServicesApproveService.update(labourServicesApprove);
+
+            if (affectCount > 0) {
+                LabourServices labourServices = labourServicesService.get(cid);
+                labourServices.setApprovalStatus("2");
+                labourServices.setUpdateBy(subject);
+                labourServices.setUpdateTime(new Date());
+                labourServicesService.update(labourServices);
+
+                msgResult.setResult(true);
+                msgResult.setData(labourServices);
+            } 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/UserAuthenticationApproveController.java

@@ -249,6 +249,8 @@ public class UserAuthenticationApproveController {
 
         try {
             UserAuthenticationApprove userAuthenticationApprove = userAuthenticationApproveService.get(id);
+            userAuthenticationApprove.setApprovePersonId(subject);
+            userAuthenticationApprove.setApproveTime(new Date());
             userAuthenticationApprove.setApprovalStatus("2");
             userAuthenticationApprove.setUpdateBy(subject);
             userAuthenticationApprove.setUpdateTime(new Date());

web/src/main/java/com/jpsoft/employment/modules/job/controller/JobUserController.java

@@ -981,6 +981,9 @@ public class JobUserController {
 
         try {
             JobUser jobUser = jobUserService.get(id);
+            if(StringUtils.isNotEmpty(jobUser.getIdCardUrl())){
+                jobUser.setIdCardUrlArray(jobUser.getIdCardUrl().split(","));
+            }
 
             if (jobUser != null) {
                 msgResult.setResult(true);

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/JobUserApiController.java

@@ -33,12 +33,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import sun.awt.IconInfo;
 import sun.misc.BASE64Decoder;
 
 import java.io.ByteArrayInputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -581,9 +583,9 @@ public class JobUserApiController {
             String headImageUrl,
             String realName,
             String sex,
-            Date birthday,
+            @DateTimeFormat(pattern = "yyyy-MM-dd")String birthday,
             String address,
-            Date firstJobTime,
+            String firstJobTime,
             String token,
             @RequestAttribute  String subject) {
         MessageResult<String> messageResult = new MessageResult<>();
@@ -598,7 +600,12 @@ public class JobUserApiController {
             jobUser.setHeadImageUrl(headImageUrl);
             jobUser.setRealName(realName);
             jobUser.setSex(sex);
-            jobUser.setBirthday(birthday);
+            if (StringUtils.isNotEmpty(birthday)) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Date birthdayTime = sdf.parse(birthday);
+                jobUser.setBirthday(birthdayTime);
+            }
+
             jobUser.setAddress(address);
             jobUser.setFirstJobTime(firstJobTime);
             jobUser.setUpdateBy(subject);

web/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
      password: jpsoft2016
 
     #测试环境
-#     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/jp_housekeeper_2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #     username: root
 #     password: jpsoft8121234