Merge remote-tracking branch 'origin/master'

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/controller/HlwDutyApplyController.java

@@ -1,12 +1,22 @@
 package org.jeecg.modules.hlwinvoice.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.hlwinvoice.entity.HlwDutyApply;
 import org.jeecg.modules.hlwinvoice.service.IHlwDutyApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @Description: hlw_duty_apply
  * @Author: jeecg-boot
@@ -21,5 +31,43 @@ public class HlwDutyApplyController {
     @Autowired
     private IHlwDutyApplyService hlwDutyApplyService;
 
+    /**
+     * 分页列表查询-新的完税证明
+     *
+     * @param hlwDutyApply
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "hlw_duty_apply-分页列表查询")
+    @ApiOperation(value = "hlw_duty_apply-分页列表查询", notes = "hlw_duty_apply-分页列表查询")
+    @GetMapping(value = "/applyList")
+    public Result<?> queryPageApplyList(HlwDutyApply hlwDutyApply,
+                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest req) {
+        Page<HlwDutyApply> page = new Page<>(pageNo, pageSize);
+        Page<HlwDutyApply> pageList = hlwDutyApplyService.pageApplyList(page, hlwDutyApply, req);
+        return Result.ok(pageList);
+    }
 
+    /**
+     * 人员明细-新的完税证明
+     *
+     * @param hlwDutyApply
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/dutyApplyUser")
+    public Result<?> queryDutyApplyUser(HlwDutyApply hlwDutyApply,
+                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest req) {
+        Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
+        Page<Map<String, Object>> pageList = hlwDutyApplyService.queryDutyApplyUser(page, hlwDutyApply, req);
+        return Result.ok(pageList);
+    }
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/service/IHlwDutyApplyService.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.hlwinvoice.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.hlwinvoice.entity.HlwDutyApply;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @Description: hlw_duty_apply
  * @Author: jeecg-boot
@@ -11,5 +15,7 @@ import org.jeecg.modules.hlwinvoice.entity.HlwDutyApply;
  */
 public interface IHlwDutyApplyService extends IService<HlwDutyApply> {
 
+    Page<HlwDutyApply> pageApplyList(Page<HlwDutyApply> page, HlwDutyApply hlwDutyApply, HttpServletRequest req);
 
+    Page<Map<String, Object>> queryDutyApplyUser(Page<Map<String, Object>> page, HlwDutyApply hlwDutyApply, HttpServletRequest req);
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/service/impl/HlwDutyApplyServiceImpl.java

@@ -1,19 +1,106 @@
 package org.jeecg.modules.hlwinvoice.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.utils.CryptTool;
+import org.jeecg.common.utils.HttpsContants;
+import org.jeecg.common.utils.OauthApi;
+import org.jeecg.common.utils.OauthTokenUtils;
 import org.jeecg.modules.hlwinvoice.entity.HlwDutyApply;
 import org.jeecg.modules.hlwinvoice.mapper.HlwDutyApplyMapper;
 import org.jeecg.modules.hlwinvoice.service.IHlwDutyApplyService;
+import org.jeecg.modules.util.RoleDataUtils;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: hlw_duty_apply
  * @Author: jeecg-boot
  * @Date: 2020-07-24
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class HlwDutyApplyServiceImpl extends ServiceImpl<HlwDutyApplyMapper, HlwDutyApply> implements IHlwDutyApplyService {
 
+    @Override
+    public Page<HlwDutyApply> pageApplyList(Page<HlwDutyApply> page, HlwDutyApply hlwDutyApply, HttpServletRequest request) {
+        //获取请求路由路径
+        String routeUrl = request.getServletPath();
+        //获取当前登录用户
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<String> companyCodeList = RoleDataUtils.findCompanyCodeList(sysUser.getUsername(), routeUrl, sysUser.getOrgCode());
+        //完税证明列表信息
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.DUTY_LIST;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", page.getCurrent());
+        parameters.put("pageSize", page.getSize());
+        parameters.put("companyCodeList", companyCodeList);
+        parameters.put("applyMonth", hlwDutyApply.getApplyMonth());
+        parameters.put("subcontractorName", hlwDutyApply.getSubcontractorName());
+        parameters.put("dutyStatus", hlwDutyApply.getDutyStatus());
+        //数据加密
+        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<HlwDutyApply> list = (List<HlwDutyApply>) jsonObject1.get("records");
+                log.info("完税证明列表数组==={}", list);
+                page.setRecords(list);
+                page.setTotal(jsonObject1.getLong("total"));
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return page;
+    }
 
+    @Override
+    public Page<Map<String, Object>> queryDutyApplyUser(Page<Map<String, Object>> page, HlwDutyApply hlwDutyApply, HttpServletRequest request) {
+        //完税人员明细列表信息
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.DUTY_USER_LIST;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", page.getCurrent());
+        parameters.put("pageSize", page.getSize());
+        parameters.put("applyMonth", hlwDutyApply.getApplyMonth());
+        parameters.put("companyId", hlwDutyApply.getCompanyId());
+        parameters.put("subcontractorId", hlwDutyApply.getSubcontractorId());
+        parameters.put("applicationId", hlwDutyApply.getApplicationId());
+        parameters.put("cpId", hlwDutyApply.getCpId());
+        //数据加密
+        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);
+                page.setRecords(list);
+                page.setTotal(jsonObject1.getLong("total"));
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return page;
+    }
 }