fan zha 0802

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -23,10 +23,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.*;
-import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
-import org.jeecg.modules.smscheck.service.PhonePurposeService;
-import org.jeecg.modules.smscheck.service.SysBusinessHallService;
-import org.jeecg.modules.smscheck.service.SysCompanyService;
+import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.util.HttpClientUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -58,6 +55,9 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     private String upLoadPath;
     @Autowired
     private BusinessReminderCardService businessReminderCardService;
+    @Autowired
+    private BusinessReminderCardLogService businessReminderCardLogService;
+
     @Autowired
     private PhonePurposeService phonePurposeService;
 
@@ -126,7 +126,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults)){
             queryWrapper.like("number_results",numberResults);
         }
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("update_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -217,7 +217,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults)){
             queryWrapper.like("number_results",numberResults);
         }
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("update_time");
         return  queryWrapper;
     }
 
@@ -375,6 +375,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody BusinessReminderCard businessReminderCard) {
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
+        businessReminderCard.setUpdateTime(new Date());
         boolean save = businessReminderCardService.save(businessReminderCard);
         if (save) {
             return Result.OK();
@@ -396,12 +397,45 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
         boolean updateById = businessReminderCardService.updateById(businessReminderCard);
+
+
+        BusinessReminderCard byId = businessReminderCardService.getById(businessReminderCard.getId());
+        BusinessReminderCardLog businessReminderCardLog =new BusinessReminderCardLog();
+        businessReminderCardLog.setBusinessReminderCardId(businessReminderCard.getId());
+        businessReminderCardLog.setUpdateTime(new Date());
+        businessReminderCardLog.setSysBusinessHall(null);//登陆人营业厅 等待
+        businessReminderCardLog.setSysCompany(null);//登陆人区级 等待
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        businessReminderCardLog.setBusinessReminderCreateBy(byId.getCreateBy());
+        businessReminderCardLog.setUpdateBy(sysUser.getUsername());
+        businessReminderCardLog.setDelFlag(0);
+        businessReminderCardLog.setUserId(byId.getId());
+        businessReminderCardLogService.save(businessReminderCardLog);
+
         if (updateById) {
             return Result.OK("修改成功");
         }
         return Result.error("修改失败");
     }
-
+    /**
+     * 查询log
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/getBusinessReminderCardLogs")
+    public Result<?> getBusinessReminderCardLogs(HttpServletRequest request) {
+        QueryWrapper<BusinessReminderCardLog> queryWrapper = QueryGenerator.initQueryWrapper(new BusinessReminderCardLog(), request.getParameterMap());
+        String businessReminderCardId = request.getParameterMap().get("businessReminderCardId")==null?"":
+                Arrays.toString(request.getParameterMap().get("businessReminderCardId")).replace("[", "").replace("]", "").replace("*", "");
+        queryWrapper.lambda()
+                .eq(BusinessReminderCardLog::getDelFlag, CommonConstant.DEL_FLAG_0)
+                .eq(BusinessReminderCardLog::getBusinessReminderCardId,businessReminderCardId).orderByDesc(BusinessReminderCardLog::getUpdateTime);
+
+        List<BusinessReminderCardLog> list = businessReminderCardLogService.list(queryWrapper);
+
+        return Result.OK(list);
+    }
 
     /**
      * 通过ID查询入网信息业务详情
@@ -477,7 +511,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
         String id = request.getParameterMap().get("id")==null?"": Arrays.toString(request.getParameterMap().get("id")).replace("[", "").replace("]", "").replace("*", "");
          LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getCreateTime);
+        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getUpdateTime);
         if (StringUtils.isNotBlank(id)){
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCardLog.java

@@ -0,0 +1,56 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:38
+ */
+@Data
+@TableName("as_business_reminder_card_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="as_business_reminder_card_log", description="入网信息表log表")
+public class BusinessReminderCardLog {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    private String createBy;
+
+    private String updateBy;
+
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+    private String sysCompany;
+
+
+    private String sysBusinessHall;
+
+    private String businessReminderCardId;
+    /** 删除标识 */
+    //@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+    private String businessReminderCreateBy;
+
+    private String userId;
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/BusinessReminderCardLogMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:42
+ */
+@Mapper
+public interface BusinessReminderCardLogMapper extends BaseMapper<BusinessReminderCardLog>{
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/BusinessReminderCardLogService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:40
+ */
+public interface BusinessReminderCardLogService extends IService<BusinessReminderCardLog> {
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/BusinessReminderCardLogServiceImpl.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+import org.jeecg.modules.smscheck.mapper.BusinessReminderCardLogMapper;
+import org.jeecg.modules.smscheck.service.BusinessReminderCardLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:41
+ */
+@Service
+public class BusinessReminderCardLogServiceImpl  extends ServiceImpl<BusinessReminderCardLogMapper, BusinessReminderCardLog> implements BusinessReminderCardLogService {
+}
+