Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,7 @@ public class EnterpriseCertificationApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
-    private String isCertification;
-    private String isCertificationName;
+    @ApiModelProperty(value = "审批状态")
+    private String approveStatus;
+    private String approveStatusName;
 }

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

@@ -44,7 +44,7 @@ public class LabourServicesApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
-    private String approvalStatus;
-    private String approvalStatusName;
+    @ApiModelProperty(value = "审批状态")
+    private String approveStatus;
+    private String approveStatusName;
 }

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

@@ -43,7 +43,7 @@ public class RecruitmentApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
+    @ApiModelProperty(value = "审批状态")
     private String approveStatus;
     private String approveStatusName;
 }

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

@@ -13,8 +13,7 @@
 		<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" />
+		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_enterprise_certification_approve
-	    (id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{companyId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="EnterpriseCertificationApproveMap">
 		select 
-id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time		from base_enterprise_certification_approve where id_=#{0}
+id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time,approve_status		from base_enterprise_certification_approve where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_enterprise_certification_approve where id_=#{0}
@@ -88,12 +91,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_pers
 
 	<select id="search" parameterType="hashmap" resultMap="EnterpriseCertificationApproveMap">
 		<![CDATA[
-			SELECT a.*,b.is_certification FROM base_enterprise_certification_approve a
-			LEFT JOIN base_company b ON a.company_id = b.id_
+			SELECT * FROM base_enterprise_certification_approve
 		]]>
 		<where>
-			<if test="searchParams.isCertification != null">
-				and b.is_certification = #{searchParams.isCertification}
+			<if test="searchParams.approveStatus != null">
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -13,8 +13,7 @@
 		<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" />
+		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LabourServicesApprove">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![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)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{labourServicesId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</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}
+id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time,approve_status		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}
@@ -84,12 +87,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,appr
 	</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_
+			SELECT * FROM base_labour_services_approve
 		]]>
 		<where>
-			<if test="searchParams.approvalStatus != null">
-				and b.approval_status = #{searchParams.approvalStatus}
+			<if test="searchParams.approveStatus != null">
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -13,7 +13,6 @@
 		<result property="recruitmentId" column="recruitment_id" />
 		<result property="approvePersonId" column="approve_person_id" />
 		<result property="approveTime" column="approve_time" />
-
 		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.RecruitmentApprove">
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into job_recruitment_approve
-	    (id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{recruitmentId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="RecruitmentApproveMap">
 		select 
-id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time		from job_recruitment_approve where id_=#{0}
+id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time,approve_status		from job_recruitment_approve where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from job_recruitment_approve where id_=#{0}
@@ -84,12 +87,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="RecruitmentApproveMap">
 		<![CDATA[
-			SELECT a.*,b.approve_status FROM job_recruitment_approve a
-			LEFT JOIN job_recruitment b ON a.recruitment_id = b.id_
+			SELECT * FROM job_recruitment_approve
 		]]>
 		<where>
 			<if test="searchParams.approveStatus != null">
-				and b.approve_status = #{searchParams.approveStatus}
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -306,6 +306,7 @@ public class CompanyController {
 
         try {
             EnterpriseCertificationApprove enterpriseCertificationApprove = enterpriseCertificationApproveService.get(id);
+            enterpriseCertificationApprove.setApproveStatus("2");
             enterpriseCertificationApprove.setApprovePersonId(subject);
             enterpriseCertificationApprove.setApproveTime(new Date());
             enterpriseCertificationApprove.setUpdateBy(subject);

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 isCertification,
+            String approveStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -273,17 +273,19 @@ public class EnterpriseCertificationApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(isCertification)) {
-            searchParams.put("isCertification",isCertification);
+        if (StringUtils.isNotEmpty(approveStatus)) {
+            searchParams.put("approveStatus",approveStatus);
         }
 
         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;
+            if(StringUtils.isEmpty(enterpriseCertificationApprove.getApproveStatus()))
+                enterpriseCertificationApprove.setApproveStatus("1");
+            switch (enterpriseCertificationApprove.getApproveStatus()){
+                case "1": enterpriseCertificationApprove.setApproveStatusName("未审批"); break;
+                case "2": enterpriseCertificationApprove.setApproveStatusName("已审批"); break;
             }
             User user = userService.get(enterpriseCertificationApprove.getCreateBy());
             enterpriseCertificationApprove.setCreateByName(user.getRealName());

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

@@ -209,7 +209,7 @@ public class LabourServicesApproveController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String approvalStatus,
+            String approveStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -218,17 +218,19 @@ public class LabourServicesApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(approvalStatus)) {
-            searchParams.put("approvalStatus",approvalStatus);
+        if (StringUtils.isNotEmpty(approveStatus)) {
+            searchParams.put("approveStatus",approveStatus);
         }
 
         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;
+            if(StringUtils.isEmpty(labourServicesApprove.getApproveStatus()))
+                labourServicesApprove.setApproveStatus("1");
+            switch (labourServicesApprove.getApproveStatus()){
+                case "1": labourServicesApprove.setApproveStatusName("未审批"); break;
+                case "2": labourServicesApprove.setApproveStatusName("已审批"); break;
             }
             User user = userService.get(labourServicesApprove.getCreateBy());
             Company company = companyService.get(user.getCompanyId());

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

@@ -359,6 +359,7 @@ public class LabourServicesController {
 
         try {
             LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+            labourServicesApprove.setApproveStatus("2");
             labourServicesApprove.setApprovePersonId(subject);
             labourServicesApprove.setApproveTime(new Date());
             labourServicesApprove.setUpdateBy(subject);

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

@@ -218,7 +218,7 @@ public class RecruitmentApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(approveStatus)) {
             searchParams.put("approveStatus",approveStatus);
@@ -226,6 +226,8 @@ public class RecruitmentApproveController {
 
         Page<RecruitmentApprove> page = recruitmentApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(RecruitmentApprove recruitmentApprove : page.getResult()){
+            if(StringUtils.isEmpty(recruitmentApprove.getApproveStatus()))
+                recruitmentApprove.setApproveStatus("2");
             switch (recruitmentApprove.getApproveStatus()){
                 case "2": recruitmentApprove.setApproveStatusName("未审批"); break;
                 case "3": recruitmentApprove.setApproveStatusName("已审批"); break;

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

@@ -750,6 +750,7 @@ public class RecruitmentController {
 
             if (affectCount > 0) {
                 RecruitmentApprove recruitmentApprove = recruitmentApproveService.get(approveId);
+                recruitmentApprove.setApproveStatus("3");
                 recruitmentApprove.setApprovePersonId(subject);
                 recruitmentApprove.setApproveTime(new Date());
                 recruitmentApproveService.update(recruitmentApprove);

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

@@ -47,6 +47,9 @@ public class WorkCategoryController {
 
         try {
             workCategory.setId(UUID.randomUUID().toString());
+            if(StringUtils.isEmpty(workCategory.getParentId())) {
+                workCategory.setParentId(null);
+            }
             workCategory.setDelFlag(false);
             workCategory.setCreateBy(subject);
             workCategory.setCreateTime(new Date());