省管理账号对应的企业管理和人员管理列表添加筛选，创建日期范围

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserPermissionDto.java

@@ -130,5 +130,26 @@ public class UserPermissionDto {
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
-    protected Date recDate;
+    protected String recDate;
+
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    protected String createDate;
+
+    /**
+     * 过滤使用-创建时间-开始
+     */
+    @ApiModelProperty(value = "创建时间")
+    protected Date createDateStart;
+
+    /**
+     * 过滤使用-创建时间-结束
+     */
+    @ApiModelProperty(value = "创建时间")
+    protected Date createDateEnd;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/dto/TzBaseEnterpriseInfoDto.java

@@ -304,4 +304,20 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 
 	@ApiModelProperty(value = "单位所在城市Code")
 	private String cityCode;
+
+	@ApiModelProperty(value = "创建时间")
+	protected Date createDate;
+
+
+	/**
+	 * 过滤使用-创建时间-开始
+	 */
+	@ApiModelProperty(value = "创建时间")
+	protected Date createDateStart;
+
+	/**
+	 * 过滤使用-创建时间-结束
+	 */
+	@ApiModelProperty(value = "创建时间")
+	protected Date createDateEnd;
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/entity/TzBaseEnterpriseInfo.java

@@ -187,4 +187,11 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "企业标签信息")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String regulatoryLabels;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_date")
+    protected Date createDate;
+
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -140,7 +140,9 @@
 					</otherwise>
 				</choose>
 			</if>
-
+			<if test="tzBaseEnterpriseInfoDto.createDateStart != null and tzBaseEnterpriseInfoDto.createDateEnd != null">
+				and (create_date between #{tzBaseEnterpriseInfoDto.createDateStart} and #{tzBaseEnterpriseInfoDto.createDateEnd})
+			</if>
 			<if test="orgCodeList != null and !orgCodeList.isEmpty()">
 				AND (
 				<foreach collection="orgCodeList" item="item" separator=" OR ">

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -25,16 +25,15 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 企业数据信息
@@ -189,8 +188,29 @@ public class TzBaseEnterpriseInfoController {
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> page(PageParam pageParam,
                                                               @RequestParam(value = "sort", required = false) String sort,
-                                                              @RequestParam Map<String, String> map) {
+                                                              @RequestParam Map<String, Object> map) {
         TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = JSON.parseObject(JSON.toJSONString(map), TzBaseEnterpriseInfoDto.class);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (!ValidationUtil.isEmpty(map.get("createDateRange"))){
+            String createDateRangeObj = Objects.toString(map.get("createDateRange"));
+            String[] split = createDateRangeObj.replace("[", "").replace("]", "").split(",");
+            String startDateStr = split[0];
+            String endDateStr = split[1];
+            try {
+                Date startDate = sdf.parse(startDateStr);
+                Date endDate = sdf.parse(endDateStr);
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                calendar.set(Calendar.HOUR_OF_DAY, 23);
+                calendar.set(Calendar.MINUTE, 59);
+                calendar.set(Calendar.SECOND, 59);
+                calendar.set(Calendar.MILLISECOND, 999);
+                endDate = calendar.getTime();
+                tzBaseEnterpriseInfoDto.setCreateDateStart(startDate);
+                tzBaseEnterpriseInfoDto.setCreateDateEnd(endDate);
+            } catch (Exception e) {
+            }
+        }
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, tzBaseEnterpriseInfoDto, sort));
     }
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java

@@ -142,4 +142,7 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "更新时间")
     protected Date recDate;
 
+    @ApiModelProperty(value = "创建时间")
+    protected Date createDate;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java

@@ -236,4 +236,10 @@ public class TzsUserInfo extends BaseEntity {
      */
     @TableField(value = "transfer_out_time")
     protected Date transferOutTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_date")
+    protected Date createDate;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -316,7 +316,8 @@
         u.sequence_nbr as uid,
         u.sequence_nbr as "rowId",
         concat(e.city, e.district) as fullAddress,
-        u.rec_date,
+        DATE_FORMAT(u.rec_date,'%Y-%m-%d') AS recDate,
+        DATE_FORMAT(u.create_date,'%Y-%m-%d') AS createDate,
         e.supervise_org_name as superviseOrgName,
         e.supervise_org_name as supervise_org_name,
         e.use_code as useCode
@@ -345,6 +346,9 @@
             <if test="filter.superviseOrgCode != null and filter.superviseOrgCode != ''">
                 and e.supervise_org_code like concat('%',#{filter.superviseOrgCode}, '%')
             </if>
+            <if test="filter.createDateStart != null and filter.createDateEnd != null">
+                and (u.create_date between #{filter.createDateStart} and #{filter.createDateEnd})
+            </if>
         </where>) as a
         <where>
             <if test="filter.useUnit != null and filter.useUnit != ''">

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -29,6 +29,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -36,15 +37,18 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 @Api(tags = "用户信息Api")
 @RequestMapping(value = "/userInfo")
@@ -122,7 +126,7 @@ public class TzsUserInfoController extends BaseController {
     public ResponseModel<IPage<TzsUserInfoDto>> queryForPage(@RequestParam(value = "current") String current,
                                                              @RequestParam(value = "size") String size,
                                                              @RequestParam(value = "sort", required = false) String sort,
-                                                             @RequestParam Map<String, String> map) {
+                                                             @RequestParam Map<String, Object> map) {
         TzsUserInfoDto dto = JSON.parseObject(JSON.toJSONString(map), TzsUserInfoDto.class);
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (ObjectUtils.isEmpty(reginParams)) {
@@ -319,10 +323,32 @@ public class TzsUserInfoController extends BaseController {
                                                                       @RequestParam(value = "size") long size,
                                                                       @RequestParam(value = "sort", required = false) String sort,
                                                                       @RequestParam(required = false, defaultValue = "all") String type,
-                                                                      @RequestBody Map<String, String> map) {
+                                                                      @RequestBody Map<String, Object> map) {
         UserPermissionDto filter = JSON.parseObject(JSON.toJSONString(map), UserPermissionDto.class);
         filter.setOrgCode(getSelectedOrgInfo().getCompany().getOrgCode());
         filter.setCityCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (!ValidationUtil.isEmpty(map.get("createDateRange"))){
+            String createDateRangeObj = Objects.toString(map.get("createDateRange"));
+            String[] split = createDateRangeObj.replace("[", "").replace("]", "").split(",");
+            String startDateStr = split[0];
+            String endDateStr = split[1];
+            try {
+                Date startDate = sdf.parse(startDateStr);
+                Date endDate = sdf.parse(endDateStr);
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                calendar.set(Calendar.HOUR_OF_DAY, 23);
+                calendar.set(Calendar.MINUTE, 59);
+                calendar.set(Calendar.SECOND, 59);
+                calendar.set(Calendar.MILLISECOND, 999);
+                endDate = calendar.getTime();
+                filter.setCreateDateStart(startDate);
+                filter.setCreateDateEnd(endDate);
+            } catch (Exception e) {
+                log.error("日期转化异常：{}", e.getMessage());
+            }
+        }
         Page<UserPermissionDto> userPermissionDtos = tzsUserInfoServiceImpl.getUserByPermission(current, size, type, filter, sort);
         return ResponseHelper.buildResponse(userPermissionDtos);
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -81,6 +81,7 @@ import javax.validation.Validator;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1118,6 +1119,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     .collect(Collectors.joining(","));
             tzsUserInfo.setSubPostName(subPostNames);
         }
+        tzsUserInfo.setCreateDate(new Date());
         tzsUserInfo = this.createWithModel(tzsUserInfo);
         // 保存资质
         tzsUserPermissionServiceImpl.savePermissionData(tzsUserInfo);
@@ -1512,6 +1514,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             dataList.forEach(data -> {
                 TzsUserInfoDto dto = new TzsUserInfoDto();
                 BeanUtils.copyProperties(data, dto);
+                dto.setCreateDate(new Date());
                 this.saveUserInfo(dto);
             });
         } catch (Exception e) {