Merge branch 'master' of https://gitlab.taihe.com/lighter/web-server

src/main/java/thyyxxk/webserver/controller/querydata/TCovidVaccinateAppointmentController.java

@@ -1,14 +1,17 @@
 package thyyxxk.webserver.controller.querydata;
 
 
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.pojo.querydata.TcovidVaccinateThreshold;
+import thyyxxk.webserver.pojo.wxapi.QueryWxOrderParam;
 import thyyxxk.webserver.service.querydata.TCovidVaccinateAppointmentService;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -25,27 +28,32 @@ import java.util.Map;
 @RestController
 @RequestMapping("/tCovidVaccinateAppointment")
 public class TCovidVaccinateAppointmentController {
-    private final TCovidVaccinateAppointmentService tc;
+    private final TCovidVaccinateAppointmentService server;
 
 
-    public TCovidVaccinateAppointmentController(TCovidVaccinateAppointmentService tc) {
-        this.tc = tc;
+    public TCovidVaccinateAppointmentController(TCovidVaccinateAppointmentService server) {
+        this.server = server;
     }
     @PostMapping("/queryXGYM")
     public ResultVo<Map<String,Object>> queryXGYM(@RequestBody TCovidVaccinateAppointment data){
-        return tc.queryXGYM(data);
+        return server.queryXGYM(data);
     }
 
     @GetMapping("/querycount")
     public ResultVo<List<TcovidVaccinateThreshold>> querycount() throws ParseException {
-        return tc.queryCount();
+        return server.queryCount();
     }
 
     @GetMapping("/update")
     public ResultVo<Boolean> update(@RequestParam("value")int value,
                                     @RequestParam("date") Date date,
                                     @RequestParam("newValue") int newValue){
-        return tc.update(value,date,newValue);
+        return server.update(value,date,newValue);
+    }
+    @PostMapping("/exportExcel")
+    public void exportExcel(HttpServletResponse response,
+                            @RequestBody @Validated TCovidVaccinateAppointment param) {
+        server.exportExcel(response,param);
     }
 }
 

src/main/java/thyyxxk/webserver/service/querydata/TCovidVaccinateAppointmentService.java

@@ -1,19 +1,21 @@
 package thyyxxk.webserver.service.querydata;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.querydata.TCovidVaccinateAppointmentMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.pojo.querydata.TcovidVaccinateThreshold;
-import thyyxxk.webserver.utils.DateUtil;
-import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.TokenUtil;
+import thyyxxk.webserver.pojo.wxapi.QueryWxOrderParam;
+import thyyxxk.webserver.utils.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -43,18 +45,8 @@ public class TCovidVaccinateAppointmentService  {
     public ResultVo<Map<String,Object>> queryXGYM(TCovidVaccinateAppointment data){
         log.info("查询新冠疫苗预约=>操作人：{}，查找姓名：{}，查找日期：{}", TokenUtil.getTokenUserId(),
                 data.getName(),data.getExecuteDate()!=null? DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"): "");
-        IPage<TCovidVaccinateAppointment> page = new Page<>(data.getCurrentPage(),data.getPageSize());
-
-        QueryWrapper<TCovidVaccinateAppointment> qw = new QueryWrapper<>();
+        IPage<TCovidVaccinateAppointment> page = getQueryPage(data);
         Map map = new HashMap();
-        if (data.getName() != null && data.getName() !="" && !data.getName().equals("")){
-            qw.eq("a.name",data.getName());
-        }
-        if (data.getExecuteDate() != null  ){
-            qw.eq("execute_date",DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"));
-        }
-        dao.mybatisPlusQueryXGYM(page,qw);
-
         if (page.getTotal()>0 || page.getRecords().size()>0){
             map.put("total",page.getTotal());
             map.put("data",page.getRecords());
@@ -81,4 +73,41 @@ public class TCovidVaccinateAppointmentService  {
                 TokenUtil.getTokenUserId(),oldDate,newRevisionDate,modificationDate);
          return ResultVoUtil.success(dao.update(newRevisionDate,oldDate));
     }
+
+    public void exportExcel(HttpServletResponse response, TCovidVaccinateAppointment param) {
+        log.info("导出新冠疫苗excel: {}", JSON.toJSONString(param));
+
+        IPage<TCovidVaccinateAppointment> page =  getQueryPage(param);
+        List<TCovidVaccinateAppointment> list = page.getRecords();
+        String[] title = {"门诊id","姓名","性别","联系电话","身份证号","年龄","工作单位","工作性质","预约接种时间"};
+        String[][] content = new String[list.size()][];
+        for (int i = 0; i < list.size(); i++){
+            content[i] = new String[title.length];
+            TCovidVaccinateAppointment tc = list.get(i);
+            content[i][0] = tc.getPatientId();
+            content[i][1] = tc.getName();
+            content[i][2] = tc.getNewSex();
+            content[i][3] = tc.getPhone();
+            content[i][4] = tc.getSocialNo();
+            content[i][5] = String.valueOf(tc.getAge());
+            content[i][6] = tc.getCorpName();
+            content[i][7] = tc.getNewJobCategory();
+            content[i][8] = DateUtil.formatDatetime(tc.getExecuteDate(),"yyyy-MM-dd");
+        }
+        ExcelUtil.exportExcel(response, title, content);
+    }
+
+    public IPage<TCovidVaccinateAppointment> getQueryPage(TCovidVaccinateAppointment param){
+        IPage<TCovidVaccinateAppointment> page = new Page<>(param.getCurrentPage(),param.getPageSize());
+
+        QueryWrapper<TCovidVaccinateAppointment> qw = new QueryWrapper<>();
+        Map map = new HashMap();
+        if (param.getName() != null && param.getName() !="" && !param.getName().equals("")){
+            qw.eq("a.name",param.getName());
+        }
+        if (param.getExecuteDate() != null  ){
+            qw.eq("execute_date",DateUtil.formatDatetime(param.getExecuteDate(),"yyyy-MM-dd"));
+        }
+        return dao.mybatisPlusQueryXGYM(page,qw);
+    }
 }

src/main/java/thyyxxk/webserver/service/wxapi/WxApiService.java

@@ -158,7 +158,7 @@ public class WxApiService {
         List<WxPayOrder> list = iPage.getRecords();
         String[] title = {"商品描述","订单类型","订单金额","姓名","门诊号","住院号","住院次数","订单号","流水号"
                 ,"订单创建时间","订单支付时间","订单支付状态","退款原因","退款操作员","退款时间"};
-        String sheetName = "sheet1";
+
         String[][] content = new String[list.size()][];
         String payStatusName = null;
         boolean multiple = true;