用户列表

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/controller/HlgUserController.java

@@ -70,9 +70,9 @@ public class HlgUserController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<HlgUser>> result = new Result<IPage<HlgUser>>();
-		QueryWrapper<HlgUser> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgUser, req.getParameterMap());
-		Page<HlgUser> page = new Page<HlgUser>(pageNo, pageSize);
-		Page<HlgUser> pageList = hlgUserService.pageList(page, hlgUser,queryWrapper);
+//		QueryWrapper<HlgUser> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgUser, req.getParameterMap());
+//		Page<HlgUser> page = new Page<HlgUser>(pageNo, pageSize);
+		Page<HlgUser> pageList = hlgUserService.pageList(pageNo, pageSize, hlgUser, req);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUser.java

@@ -66,4 +66,11 @@ public class HlgUser implements Serializable {
 
 
 	private String userCode;
+
+	@TableField(exist = false)
+	private Integer contractUpload;  //0:未上传 1：已上传
+
+	@TableField(exist = false)
+	private String lastPaymentCompany;
+
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/HlgUserMapper.java

@@ -22,4 +22,6 @@ public interface HlgUserMapper extends BaseMapper<HlgUser> {
     int findCountIdcardNumberByIdcardNumber(String idcardNumber);
 
     HlgUser getUserByIdcardNumber(String idcardNumber);
+
+    HlgUser getUserByUserCode(String userCode);
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/xml/HlgUserMapper.xml

@@ -60,9 +60,7 @@
 					AND hus.subcontract is not null
 				</if>
 			</if>
-			<if test="hlgUser.lastPaymentCompany != null and hlgUser.lastPaymentCompany != ''">
-				AND a.last_payment_company LIKE concat('%',#{hlgUser.lastPaymentCompany},'%')
-			</if>
+
         </where>
 		GROUP BY a.id
         ORDER BY a.update_time DESC,a.id asc
@@ -140,4 +138,13 @@
 		WHERE a.idcard_number = #{0}
 		group by a.id
 	</select>
+
+
+	<select id="getUserByUserCode" resultType="org.jeecg.modules.hlguser.entity.HlgUser" >
+		SELECT
+		<include refid="hlgUserColumns"/>
+		FROM hlg_user a
+		<include refid="hlgUserJoins"/>
+		WHERE a.user_code=#{0}
+	</select>
 </mapper>

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/IHlgUserService.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.hlguser.entity.HlgUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ import java.util.List;
  */
 public interface IHlgUserService extends IService<HlgUser> {
 
-    Page<HlgUser> pageList(Page<HlgUser> page, HlgUser hlgUser, QueryWrapper<HlgUser> queryWrapper);
+    Page<HlgUser> pageList(Integer pageNo, Integer pageSize, HlgUser hlgUser, HttpServletRequest request );
 
     List importExcel(MultipartFile file);
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserServiceImpl.java

@@ -25,6 +25,7 @@ import org.jeecg.modules.hlguser.mapper.HlgUserSubcontractMapper;
 import org.jeecg.modules.hlguser.service.IHlgUserService;
 import org.jeecg.modules.hlguser.service.IHlgUserSubcontractService;
 import org.jeecg.modules.util.ExcelUtils;
+import org.jeecg.modules.util.RoleDataUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 
@@ -52,8 +54,46 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
     private IHlgUserSubcontractService hlgUserSubcontractService;
 
     @Override
-    public Page<HlgUser> pageList(Page<HlgUser> pageList, HlgUser hlgUser, QueryWrapper<HlgUser> queryWrapper) {
-        return pageList.setRecords(baseMapper.findList(pageList, hlgUser, queryWrapper));
+    public Page<HlgUser> pageList(Integer pageNo, Integer pageSize, HlgUser hlgUser, HttpServletRequest request) {
+        Page<HlgUser> page = new Page<HlgUser>();
+        //慧盈查询用户列表
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.userList;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", pageNo);
+        parameters.put("pageSize", pageSize);
+        parameters.put("name", hlgUser.getName());
+        parameters.put("idcardNumber", hlgUser.getIdcardNumber());
+        parameters.put("idcardPictureType", hlgUser.getIdcardPicture());
+        parameters.put("contractUpload", hlgUser.getContractUpload());
+        parameters.put("lastPaymentCompany", hlgUser.getLastPaymentCompany());
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("用户列表===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
+                log.info("用户列表===={}", jsonObject);
+                JSONObject jsonObject1 = jsonObject.getJSONObject("result");
+                List<Map<String, Object>> list = ( List<Map<String, Object>>) jsonObject1.get("records");
+                log.info("用户列表==={}", list);
+                List<HlgUser> list1=new ArrayList();
+                for (int i = 0; i <list.size() ; i++) {
+                    HlgUser hlgUser1=baseMapper.getUserByUserCode((String)list.get(i).get("userCode"));
+                    if(list.get(i).get("lastPaymentCompany")!=null){
+                        hlgUser1.setLastPaymentCompany((String)list.get(i).get("lastPaymentCompany"));
+                    }
+                    list1.add(hlgUser1);
+                }
+                page.setRecords(list1);
+                page.setTotal(jsonObject1.getLong("total"));
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return page;
     }
 
 

happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -96,4 +96,7 @@ public interface OauthApi {
     //企业账户监测
     public static final String statisticData = "/oauth/autoMonitor/statisticData";
 
+    //用户列表
+    public static final String userList="/oauth/hlwUser/list";
+
 }