劳务对接管理

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

@@ -20,6 +20,8 @@ public class LabourServices {
     private String id;
         @ApiModelProperty(value = "类型(我要用工人,我有工人等)")
     private String type;
+    @ApiModelProperty(value = "类型(我要用工人,我有工人等)")
+    private String typeN;
         @ApiModelProperty(value = "内容")
     private String content;
         @ApiModelProperty(value = "状态(上架下架等")
@@ -28,6 +30,8 @@ public class LabourServices {
     private Integer sortNo;
         @ApiModelProperty(value = "审批状态")
     private String approvalStatus;
+    @ApiModelProperty(value = "审批状态")
+    private String approvalStatusN;
         @ApiModelProperty(value = "")
     private String createBy;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@@ -44,6 +48,9 @@ public class LabourServices {
     private Boolean delFlag;
         @ApiModelProperty(value = "审批人")
     private String approvePersonId;
+
+    @ApiModelProperty(value = "审批人")
+    private String approvePersonName;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")

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

@@ -2,7 +2,7 @@
 <!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.dao.LabourServicesDAO">
+<mapper namespace="com.jpsoft.employment.modules.base.dao.LabourServicesDAO">
 	<resultMap id="LabourServicesMap" type="com.jpsoft.employment.modules.base.entity.LabourServices">
 		<id property="id" column="id_" />
 			<result property="type" column="type_" />
@@ -105,8 +105,19 @@ id_,type_,content_,status_,sort_no,approval_status,create_by,create_time,update_
 			select * from base_labour_services
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag = false
+			<if test="searchParams.approvalStatus != null">
+				and approval_status = #{searchParams.approvalStatus}
+			</if>
+			<if test="searchParams.beginTime != null">
+				<![CDATA[
+                  and approve_time >= #{searchParams.beginTime}
+                ]]>
+			</if>
+			<if test="searchParams.endTime != null">
+				<![CDATA[
+                  and approve_time <= #{searchParams.endTime}
+                ]]>
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -6,6 +6,9 @@ import com.jpsoft.employment.modules.base.service.LabourServicesService;
 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.DataDictionaryService;
+import com.jpsoft.employment.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -27,12 +30,19 @@ public class LabourServicesController {
     @Autowired
     private LabourServicesService labourServicesService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<LabourServices> create(){
         MessageResult<LabourServices> msgResult = new MessageResult<>();
 
         LabourServices labourServices = new LabourServices();
+        labourServices.setType("1");
 
         msgResult.setData(labourServices);
         msgResult.setResult(true);
@@ -50,6 +60,8 @@ public class LabourServicesController {
             labourServices.setDelFlag(false);
             labourServices.setCreateBy(subject);
             labourServices.setCreateTime(new Date());
+            labourServices.setStatus("0");
+            labourServices.setApprovalStatus("1");
             
             int affectCount = labourServicesService.insert(labourServices);
 
@@ -196,7 +208,7 @@ public class LabourServicesController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String approvalStatus,String approveTimeRange,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,14 +221,53 @@ public class LabourServicesController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(approvalStatus)) {
+            searchParams.put("approvalStatus",approvalStatus);
         }
 
+        if (StringUtils.isNotEmpty(approveTimeRange)) {
+            String[] timeRangeArray = approveTimeRange.split(",");
+            String beginTime = "";
+            String endTime = "";
+            beginTime+=" 00:00:00";
+            if (timeRangeArray.length == 1) {
+                beginTime = timeRangeArray[0];
+            } else if (timeRangeArray.length == 2) {
+                beginTime = timeRangeArray[0];
+                endTime = timeRangeArray[1];
+                beginTime+=" 00:00:00";
+                endTime+=" 23:59:59";
+            }
+
+            searchParams.put("beginTime", beginTime);
+            searchParams.put("endTime", endTime);
+        }
+
+
         Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (LabourServices labourServices:page) {
+
+            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
+
+            labourServices.setTypeN(typeN);
+
+            String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
+
+            labourServices.setApprovalStatusN(approvalStatusN);
+
+            User user = userService.get(labourServices.getApprovePersonId());
+
+            if(user!=null) {
+                labourServices.setApprovePersonName(user.getRealName());
+            }
+
+
+        }
+
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));