企业认证状态修改

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

@@ -14,5 +14,7 @@ public interface CityDAO {
 	City get(String id);
 	int delete(String id);
 	List<City> list();
+	List<City> findByType(String type);
+	List<City> findByPid(String pid);
 	List<City> search(Map<String,Object> searchParams,List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dto/CompanyDTO.java

@@ -0,0 +1,46 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CompanyDTO {
+    @ApiModelProperty(value = "企业ID")
+    private String id;
+
+    @ApiModelProperty(value = "企业名称")
+    private String name;
+
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    @ApiModelProperty(value = "企业规模")
+    private String scale;
+
+    @ApiModelProperty(value = "所属行业")
+    private String industry;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String zone;
+
+    @ApiModelProperty(value = "企业地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系电话")
+    private String tel;
+
+    @ApiModelProperty(value = "信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "法人代表")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "营业执照")
+    private String businessLicenseUrl;
+}

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

@@ -60,7 +60,7 @@ public class Company {
     private Date updateTime;
         @ApiModelProperty(value = "删除标示")
     private Boolean delFlag;
-        @ApiModelProperty(value = "是否企业认证")
+        @ApiModelProperty(value = "企业认证状态（0：未提交，1：审核中，2：已认证，3：认证失败）")
     private Boolean isCertification;
         @ApiModelProperty(value = "信用代码")
     private String creditCode;

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

@@ -13,5 +13,7 @@ public interface CityService {
 	int update(City model);
 	int delete(String id);
 	List<City> list();
+	List<City> findByType(String type);
+	List<City> findByPid(String pid);
 	Page<City> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

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

@@ -3,6 +3,7 @@ package com.jpsoft.employment.modules.base.service;
 import java.util.List;
 import java.util.Map;
 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.common.dto.Sort;
 
@@ -10,6 +11,7 @@ public interface EnterpriseCertificationApproveService {
 	EnterpriseCertificationApprove get(String id);
 	boolean exist(String id);
 	int insert(EnterpriseCertificationApprove model);
+	int updateCompany(Company company);
 	int update(EnterpriseCertificationApprove model);
 	int delete(String id);
 	List<EnterpriseCertificationApprove> list();

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

@@ -58,6 +58,16 @@ public class CityServiceImpl implements CityService {
 		// TODO Auto-generated method stub
 		return cityDAO.list();
 	}
+
+	@Override
+	public  List<City> findByType(String type){
+		return cityDAO.findByType(type);
+	}
+
+	@Override
+	public List<City> findByPid(String pid){
+		return cityDAO.findByPid(pid);
+	}
 		
 	@Override
 	public Page<City> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

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

@@ -5,7 +5,9 @@ import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
 
+import com.jpsoft.employment.modules.base.dao.CompanyDAO;
 import com.jpsoft.employment.modules.base.dao.EnterpriseCertificationApproveDAO;
+import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
 import com.jpsoft.employment.modules.base.service.EnterpriseCertificationApproveService;
 import org.springframework.stereotype.Component;
@@ -20,6 +22,9 @@ public class EnterpriseCertificationApproveServiceImpl implements EnterpriseCert
 	@Resource(name="enterpriseCertificationApproveDAO")
 	private EnterpriseCertificationApproveDAO enterpriseCertificationApproveDAO;
 
+	@Resource(name="companyDAO")
+	private CompanyDAO companyDAO;
+
 	@Override
 	public EnterpriseCertificationApprove get(String id) {
 		// TODO Auto-generated method stub
@@ -34,6 +39,24 @@ public class EnterpriseCertificationApproveServiceImpl implements EnterpriseCert
 		return enterpriseCertificationApproveDAO.insert(model);
 	}
 
+	@Override
+	public int updateCompany(Company company){
+		int affectCount = companyDAO.update(company);
+
+		int count = 0;
+
+		if(affectCount>0){
+			EnterpriseCertificationApprove item = new EnterpriseCertificationApprove();
+			item.setCompanyId(company.getId());
+			item.setCreateBy(company.getCreateBy());
+			item.setCreateTime(company.getCreateTime());
+
+			count = enterpriseCertificationApproveDAO.insert(item);
+		}
+
+		return count;
+	}
+
 	@Override
 	public int update(EnterpriseCertificationApprove model) {
 		// TODO Auto-generated method stub

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

@@ -55,6 +55,13 @@ id_,city_name,type_,pid_		from base_city where id_=#{0}
 	<select id="list" resultMap="CityMap">
 		select * from base_city
 	</select>
+	<select id="findByType" resultMap="CityMap">
+		select * from base_city where type_ = #{0}
+	</select>
+	<select id="findByPid" resultMap="CityMap">
+		select * from base_city where pid_ = #{0}
+	</select>
+
 	<select id="search" parameterType="hashmap" resultMap="CityMap">
 		<![CDATA[
 			select * from base_city

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

@@ -59,7 +59,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
-,#{isCertification,jdbcType= NUMERIC }
+,#{isCertification,jdbcType= VARCHAR }
 ,#{creditCode,jdbcType=VARCHAR}
 ,#{legalPerson,jdbcType=VARCHAR}
 ,#{legalTel,jdbcType=VARCHAR}
@@ -127,7 +127,7 @@
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
 				<if test="isCertification!=null">
-		is_certification=#{isCertification,jdbcType= NUMERIC },
+		is_certification=#{isCertification,jdbcType= VARCHAR },
 		</if>
 				<if test="creditCode!=null">
 		credit_code=#{creditCode,jdbcType=VARCHAR},

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

@@ -124,4 +124,31 @@ public class CityController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value = "省市区列表")
+    @RequestMapping(value = "cityListByType", method = RequestMethod.POST)
+    public MessageResult<List> cityListByType(String type) {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        List<City> cityList = cityService.findByType(type);
+
+        msgResult.setResult(true);
+        msgResult.setData(cityList);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value = "市区列表")
+    @RequestMapping(value = "cityListByPid", method = RequestMethod.POST)
+    public MessageResult<List> cityListByPid(String pid) {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        List<City> cityList = cityService.findByPid(pid);
+
+        msgResult.setResult(true);
+        msgResult.setData(cityList);
+
+        return msgResult;
+    }
 }

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

@@ -1,13 +1,20 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.dto.CompanyDTO;
+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;
+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 net.sf.json.JSON;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,14 +34,22 @@ public class EnterpriseCertificationApproveController {
     @Autowired
     private EnterpriseCertificationApproveService enterpriseCertificationApproveService;
 
+    @Autowired
+    private CompanyService companyService;
+
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
-    public MessageResult<EnterpriseCertificationApprove> create(){
-        MessageResult<EnterpriseCertificationApprove> msgResult = new MessageResult<>();
+    public MessageResult<Company> create(@RequestAttribute String subject){
+        MessageResult<Company> msgResult = new MessageResult<>();
+
+        User user = userService.get(subject);
 
-        EnterpriseCertificationApprove enterpriseCertificationApprove = new EnterpriseCertificationApprove();
+        Company company = companyService.get(user.getCompanyId());
 
-        msgResult.setData(enterpriseCertificationApprove);
+        msgResult.setData(company);
         msgResult.setResult(true);
 
         return msgResult;
@@ -42,20 +57,39 @@ public class EnterpriseCertificationApproveController {
     
     @ApiOperation(value="添加信息")
     @PostMapping("add")
-    public MessageResult<EnterpriseCertificationApprove> add(@RequestBody EnterpriseCertificationApprove enterpriseCertificationApprove,@RequestAttribute String subject){
-        MessageResult<EnterpriseCertificationApprove> msgResult = new MessageResult<>();
+    public MessageResult<Company> add(@RequestBody CompanyDTO dto, @RequestAttribute String subject){
+        MessageResult<Company> msgResult = new MessageResult<>();
 
         try {
-            enterpriseCertificationApprove.setId(UUID.randomUUID().toString());
-            enterpriseCertificationApprove.setDelFlag(false);
-            enterpriseCertificationApprove.setCreateBy(subject);
-            enterpriseCertificationApprove.setCreateTime(new Date());
-            
-            int affectCount = enterpriseCertificationApproveService.insert(enterpriseCertificationApprove);
+
+            Company company = companyService.get(dto.getId());
+
+            company.setName(dto.getName());
+            company.setLogo(dto.getLogo());
+            company.setScale(dto.getScale());
+            company.setIndustry(dto.getIndustry());
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("province",dto.getProvince());
+            jsonObject.put("city",dto.getCity());
+            jsonObject.put("zone",dto.getZone());
+
+            company.setArea(jsonObject.toString());
+            company.setAddress(dto.getAddress());
+            company.setTel(dto.getTel());
+            company.setCreditCode(dto.getCreditCode());
+            company.setLegalPerson(dto.getLegalPerson());
+            company.setBusinessLicenseUrl(dto.getBusinessLicenseUrl());
+            company.setCreateBy(subject);
+            company.setCreateTime(new Date());
+            company.setIsCertification(false);
+
+
+            int affectCount = enterpriseCertificationApproveService.updateCompany(company);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(enterpriseCertificationApprove);
+                msgResult.setData(company);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");