添加开业检查和留言记录信息

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/AlFsdAllControllerWeb.java

@@ -2,9 +2,13 @@ package com.bizmatics.mhfire.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.mhfire.service.AlFsdAllService;
+import com.bizmatics.mhfire.service.vo.AlFsdAllCsVO;
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.Date;
 
@@ -32,4 +36,12 @@ public class AlFsdAllControllerWeb {
                                                  @RequestParam(required = false) Date endTime){
         return ApiResult.success(alFsdAllService.getAlFsdAllNumber(startTime,endTime));
     }
+    /**
+     * 获取开业检查记录的汇总
+     * @return
+     */
+    @GetMapping("/csCount")
+    public ApiResult<AlFsdAllCsVO> getCsCount(){
+        return ApiResult.success(alFsdAllService.getCsCount());
+    }
 }

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionMessageController.java

@@ -3,17 +3,17 @@ package com.bizmatics.mhfire.controller.web.bulehelp;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  搜索问题记录表
@@ -43,5 +43,26 @@ public class RobotQuestionMessageController {
                                                         @RequestParam(required = false) String classIf){
         return ApiResult.success(robotQuestionMessageService.page(current, size, classIf));
     }
+
+    /**
+     * 获取月份图标信息
+     * @return
+     */
+    @GetMapping("/ico")
+    public ApiResult<List<Integer>> getIco(){
+        return ApiResult.success(robotQuestionMessageService.getIco());
+    }
+
+    /**
+     * 获取总数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/count")
+    public ApiResult<Integer> getCount(@RequestParam(required = false) Date startTime,
+                                                            @RequestParam(required = false) Date endTime){
+        return ApiResult.success(robotQuestionMessageService.getCount(startTime,endTime));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionMessageRecordController.java

@@ -3,17 +3,17 @@ package com.bizmatics.mhfire.controller.web.bulehelp;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  留言记录信息
@@ -40,5 +40,26 @@ public class RobotQuestionMessageRecordController {
                                                             @RequestParam Integer size){
         return ApiResult.success(robotQuestionMessageRecordService.page(current, size));
     }
+
+    /**
+     * 获取月份图标信息
+     * @return
+     */
+    @GetMapping("/ico")
+    public ApiResult<List<Integer>> getIco(){
+        return ApiResult.success(robotQuestionMessageRecordService.getIco());
+    }
+
+    /**
+     * 获取总数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/count")
+    public ApiResult<Integer> getCount(@RequestParam(required = false) Date startTime,
+                                       @RequestParam(required = false) Date endTime){
+        return ApiResult.success(robotQuestionMessageRecordService.getCount(startTime,endTime));
+    }
 }
 

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/BsSupervisionAllMapper.java

@@ -3,7 +3,6 @@ package com.bizmatics.mhfire.persistence.mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import javax.xml.crypto.Data;
 import java.util.Date;
 import java.util.Map;
 
@@ -20,7 +19,8 @@ public interface BsSupervisionAllMapper {
                         @Param("typeTwoLetter") String typeTwoLetter,
                         @Param("startTime") Date startTime,
                         @Param("endTime") Date endTime,
-                        @Param("unitId") String unitId);
+                        @Param("unitId") String unitId,
+                        @Param("qualifiedFlag") String qualifiedFlag);
 
 
     Map<String,String> selectByRecentlyOne(@Param("typeOneLetter") String typeOneLetter,

mhfire-mapping/src/main/resources/mapper/mysql/BsSupervisionAll.xml

@@ -19,6 +19,9 @@
             <if test="unitId != null and unitId != ''">
                 and `项目单位ID` = #{unitId}
             </if>
+            <if test="qualifiedFlag != null and qualifiedFlag != ''">
+                and `项目结果` = #{qualifiedFlag}
+            </if>
         </where>
     </select>
     <select id="selectByRecentlyOne" resultType="java.util.Map">

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/RobotQuestionMessage.java

@@ -2,12 +2,13 @@ package com.bizmatics.mhfire.model.bulehelp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -51,9 +52,9 @@ public class RobotQuestionMessage implements Serializable {
      */
     private String classify;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
-    private LocalDateTime lastUpdTime;
+    private Date lastUpdTime;
 
 
 }

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/RobotQuestionMessageRecord.java

@@ -3,12 +3,13 @@ package com.bizmatics.mhfire.model.bulehelp;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -51,9 +52,9 @@ public class RobotQuestionMessageRecord implements Serializable {
      */
     private String maskedPhoneNo;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
-    private LocalDateTime lastUpdTime;
+    private Date lastUpdTime;
 
     /**
      * 状态

mhfire-service/src/main/java/com/bizmatics/mhfire/service/AlFsdAllService.java

@@ -1,5 +1,6 @@
 package com.bizmatics.mhfire.service;
 
+import com.bizmatics.mhfire.service.vo.AlFsdAllCsVO;
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 
 import java.util.Date;
@@ -18,4 +19,10 @@ public interface AlFsdAllService {
      * @return
      */
     AlFsdAllVO getAlFsdAllNumber(Date startTime,Date endTime);
+
+    /**
+     * 获取开业检查记录的汇总
+     * @return
+     */
+    AlFsdAllCsVO getCsCount();
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionMessageRecordService.java

@@ -2,10 +2,11 @@ package com.bizmatics.mhfire.service.bulehelp;
 
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
-import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 
+import java.util.Date;
+import java.util.List;
+
 
 /**
  * <p>
@@ -18,4 +19,19 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 public interface RobotQuestionMessageRecordService extends CrudService<RobotQuestionMessageRecord> {
     CommonPage<RobotQuestionMessageRecord> page(Integer current,Integer size);
 
+
+    /**
+     * 获取月份图标信息
+     * @return
+     */
+    List<Integer> getIco();
+
+    /**
+     * 获取总数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    Integer getCount(Date startTime, Date endTime);
+
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionMessageService.java

@@ -2,10 +2,11 @@ package com.bizmatics.mhfire.service.bulehelp;
 
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
-import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 
+import java.util.Date;
+import java.util.List;
+
 
 /**
  * <p>
@@ -18,4 +19,19 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 public interface RobotQuestionMessageService extends CrudService<RobotQuestionMessage> {
 
     CommonPage<RobotQuestionMessage> page(Integer current,Integer size,String param);
+
+
+    /**
+     * 获取月份图标信息
+     * @return
+     */
+    List<Integer> getIco();
+
+    /**
+     * 获取总数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    Integer getCount(Date startTime,Date endTime);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionMessageRecordServiceImpl.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.core.util.StringUtils;
+import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionMessageRecordMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageRecordService;
@@ -19,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -45,4 +45,25 @@ public class RobotQuestionMessageRecordServiceImpl extends AbstractCrudService<R
         );
         return this.ToCommonPage(page);
     }
+    @Override
+    public List<Integer> getIco() {
+        List<Integer> list = new ArrayList<>();
+        Date date = new Date();
+        for (int i = 1; i <= Integer.parseInt(DateUtils.getDay(date)); i++) {
+            Date setDays = DateUtils.setDays(date, i);
+            Date dayStartTime = DateUtils.getDayStartTime(setDays);
+            Date dayEndTime = DateUtils.getDayEndTime(setDays);
+            list.add(getCount(dayStartTime,dayEndTime));
+        }
+        return list;
+    }
+
+    @Override
+    public Integer getCount(Date startTime,Date endTime) {
+        LambdaQueryWrapper<RobotQuestionMessageRecord> queryWrapper = Wrappers.lambdaQuery(RobotQuestionMessageRecord.class);
+        if (null != startTime && null != endTime){
+            queryWrapper.between(RobotQuestionMessageRecord::getCreateTime,startTime,endTime);
+        }
+        return this.count(queryWrapper);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionMessageServiceImpl.java

@@ -6,17 +6,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionMessageMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -38,4 +39,26 @@ public class RobotQuestionMessageServiceImpl extends AbstractCrudService<RobotQu
         page = baseMapper.selectPage(page, productLambdaQueryWrapper);
         return this.ToCommonPage(page);
     }
+
+    @Override
+    public List<Integer> getIco() {
+        List<Integer> list = new ArrayList<>();
+        Date date = new Date();
+        for (int i = 1; i <= Integer.parseInt(DateUtils.getDay(date)); i++) {
+            Date setDays = DateUtils.setDays(date, i);
+            Date dayStartTime = DateUtils.getDayStartTime(setDays);
+            Date dayEndTime = DateUtils.getDayEndTime(setDays);
+            list.add(getCount(dayStartTime,dayEndTime));
+        }
+        return list;
+    }
+
+    @Override
+    public Integer getCount(Date startTime,Date endTime) {
+        LambdaQueryWrapper<RobotQuestionMessage> queryWrapper = Wrappers.lambdaQuery(RobotQuestionMessage.class);
+        if (null != startTime && null != endTime){
+            queryWrapper.between(RobotQuestionMessage::getCreateTime,startTime,endTime);
+        }
+        return this.count(queryWrapper);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/AlFsdAllServiceImpl.java

@@ -1,11 +1,14 @@
 package com.bizmatics.mhfire.service.impl;
 
-import com.bizmatics.mhfire.persistence.mapper.*;
+import com.bizmatics.mhfire.persistence.mapper.AlFsdDisagreeMapper;
+import com.bizmatics.mhfire.persistence.mapper.AlFsdSeqMapper;
+import com.bizmatics.mhfire.persistence.mapper.AlFsdVoucherMapper;
+import com.bizmatics.mhfire.persistence.mapper.BsSupervisionAllMapper;
 import com.bizmatics.mhfire.service.AlFsdAllService;
-import com.bizmatics.mhfire.service.AlFsdSeqService;
 import com.bizmatics.mhfire.service.enums.BsSaOneCode;
 import com.bizmatics.mhfire.service.enums.BsSaTwoCode;
 import com.bizmatics.mhfire.service.util.Arith;
+import com.bizmatics.mhfire.service.vo.AlFsdAllCsVO;
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,7 +37,7 @@ public class AlFsdAllServiceImpl implements AlFsdAllService {
         AlFsdAllVO alFsdAllVo = new AlFsdAllVO();
         alFsdAllVo.setAcceptNumber(alFsdVoucherMapper.selectCount(startTime,endTime));
         alFsdAllVo.setCheckNumber(bsSupervisionAllMapper.selectCount
-                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(),startTime,endTime,null));
+                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(),startTime,endTime,null,null));
         //行政许可安全检查合格证
         Integer seqCount = alFsdSeqMapper.selectCount(startTime, endTime);
         //行政许可-消防安检申报不同意
@@ -43,4 +46,17 @@ public class AlFsdAllServiceImpl implements AlFsdAllService {
         alFsdAllVo.setQualifiedRadio(Arith.div(seqCount,seqCount+disagreeCount));
         return alFsdAllVo;
     }
+
+    @Override
+    public AlFsdAllCsVO getCsCount() {
+        AlFsdAllCsVO alFsdAllCsVO = new AlFsdAllCsVO();
+        Integer count = bsSupervisionAllMapper.selectCount
+                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(), null, null, null, null);
+        Integer noQualified = bsSupervisionAllMapper.selectCount
+                (BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(), null, null, null, "2");
+        alFsdAllCsVO.setCount(count);
+        alFsdAllCsVO.setNoQualified(noQualified);
+        alFsdAllCsVO.setCount(count-noQualified);
+        return alFsdAllCsVO;
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AlFsdAllCsVO.java

@@ -0,0 +1,25 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/8/2 15:54
+ */
+@Data
+public class AlFsdAllCsVO {
+
+    /**
+     * 总数
+     */
+    private Integer count;
+    /**
+     * 合格
+     */
+    private Integer qualified;
+
+    /**
+     * 不合格
+     */
+    private Integer noQualified;
+}