Merge remote-tracking branch 'origin/dev0310' into dev0310

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * @since 2023-03-23 08:39:46
  */
 @RestController
-@RequestMapping("emailMaintain")
+@RequestMapping("/emailMaintain")
 public class EmailMaintainController extends AbstractController  {
     /**
      * 服务对象
@@ -33,10 +33,10 @@ public class EmailMaintainController extends AbstractController  {
      * @param pramsMap 筛选条件
      * @return 查询结果
      */
-    @GetMapping("/queryByPage")
+    @PostMapping("/queryByPage")
     public ResponseEntity<R> queryByPage(@RequestBody Map<String, Object> pramsMap) {
         // 入参统一在入口处理
-        pramsMap.put("dbName", getUserInfo().getDbName());
+//        pramsMap.put("dbName", getUserInfo().getDbName());
 //        List<String> gfshList = new ArrayList<>();
 //        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
 //            gfshList.add(pramsMap.get("gfsh").toString());
@@ -81,7 +81,7 @@ public class EmailMaintainController extends AbstractController  {
      * @return 编辑结果
      */
     @PostMapping("/edit")
-    public ResponseEntity<R> edit(EmailMaintainVo emailMaintain) {
+    public ResponseEntity<R> edit(@RequestBody  EmailMaintainVo emailMaintain) {
         boolean b = emailMaintainService.update(emailMaintain);
         if(b){
             return ResponseEntity.ok(R.ok());

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * @since 2023-03-23 08:42:35
  */
 @RestController
-@RequestMapping("mailGatherLog")
+@RequestMapping("/mailGatherLog")
 public class MailGatherLogController extends AbstractController {
     /**
      * 服务对象
@@ -36,7 +36,7 @@ public class MailGatherLogController extends AbstractController {
     @PostMapping("/queryByPage")
     public ResponseEntity<R> queryByPage(@RequestBody Map<String, Object> pramsMap) {
 
-        pramsMap.put("dbName", getUserInfo().getDbName());
+//        pramsMap.put("dbName", getUserInfo().getDbName());
         if (pramsMap.get("username") == null || "".equals(pramsMap.get("username"))) {
             return ResponseEntity.ok(R.error("收件人姓名不能为空！"));
         }

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java

@@ -53,6 +53,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
         PageHelper.startPage(curr, size);
         List<EmailMaintainVo> emailMaintainVos = emailMaintainDao.queryAllByLimit(pramsMap);
         PageInfo<EmailMaintainVo> pageInfo = new PageInfo<>(emailMaintainVos);
+        returnList.add(pageInfo);
         // 设置记录总数
         json.put("total", pageInfo.getTotal());
         json.put("datalist", returnList);
@@ -76,7 +77,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
             emailMaintain.setId(IdUtil.nanoId());
         }
         if(StringUtils.isEmpty(emailMaintain.getDelStatus())){
-            emailMaintain.setId("0");
+            emailMaintain.setDelStatus("0");
         }
         emailMaintain.setCreateTime(new Date());
         emailMaintain.setModifyTime(new Date());

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java

@@ -50,6 +50,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
         PageHelper.startPage(curr, size);
         List<MailGatherLogVo> emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap);
         PageInfo<MailGatherLogVo> pageInfo = new PageInfo<>(emailMaintainVos);
+        returnList.add(pageInfo);
         // 设置记录总数
         json.put("total", pageInfo.getTotal());
         json.put("datalist", returnList);

dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml

@@ -83,8 +83,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into email_maintain(dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time)
+        insert into email_maintain(id, dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time)
-        values (#{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createTime}, #{delStatus}, #{modifyTime})
+        values (#{id}, #{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createTime}, #{delStatus}, #{modifyTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">

dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml

@@ -66,7 +66,6 @@
                 and create_time = #{createTime}
             </if>
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
     </select>
 
     <!--统计总行数-->

dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

@@ -129,7 +129,7 @@ public class SignFpqsController extends AbstractController {
      * @return 返回结果
      *
      */
-    @RequestMapping("/sign/sendEmailByQs")
+    @RequestMapping("/sendEmailByQs")
     @ResponseBody
     @SysLog("手工签收--邮箱签收")
     public ResponseEntity<?> sendEmailByQs(@RequestBody Map<String, Object> pramsMap) {
@@ -142,7 +142,7 @@ public class SignFpqsController extends AbstractController {
         return ResponseEntity.ok(signFpqsService.qsSendEmail(pramsMap));
     }
 
-    @RequestMapping("/sign/qsExport")
+    @RequestMapping("/qsExport")
     public void qsExport(@RequestBody Map<String, Object> pramsMap, HttpServletResponse response){
         if (pramsMap.get("ids") == null || "".equals(pramsMap.get("ids"))) {
 //            return ResponseEntity.ok(R.error("请选择发票数据"));