sdsd

src/main/java/com/template/controller/SmartUserController.java

@@ -3885,7 +3885,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "student/update";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "\",\"student_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(su.getTimeGroupId());
         JSONObject jsonobject = new JSONObject();
@@ -3926,7 +3926,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "student/update";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "\",\"student_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(su.getTimeGroupId());
         JSONObject jsonobject = new JSONObject();
@@ -3966,7 +3966,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "student/update";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "\",\"student_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(su.getTimeGroupId());
         JSONObject jsonobject = new JSONObject();
@@ -4008,7 +4008,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "student/create";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(idCard) ? "\",\"student_idcard\":\"" + idCard : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(idCard) ? "\",\"student_idcard\":\"" + idCard : "\",\"student_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(timeGroupId);
         JSONObject jsonobject = new JSONObject();
@@ -4091,7 +4091,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "staff/create";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"staff_idcard\":\"" + su.getIdCard() : "\",\"staff_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(su.getTimeGroupId());
         JSONObject jsonobject = new JSONObject();
@@ -4138,7 +4138,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         String appSecret = controlConfig.getAppSecret();
         String url = controlConfig.getUrl() + "staff/update";
 
-        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"student_idcard\":\"" + su.getIdCard() : "";
+        String idCardStr = org.springframework.util.StringUtils.hasText(su.getIdCard()) ? "\",\"staff_idcard\":\"" + su.getIdCard() : "\",\"staff_idcard\":\"" + "";
 
         String bsGroupNo = eGroupTime(su.getTimeGroupId());
         JSONObject jsonobject = new JSONObject();
@@ -4331,7 +4331,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
                 //时间组
                 Optional<SmartTimeGroup> oTimeGroup = timeGroups.stream().filter(e -> e.getId().equals(data.getTimeGroupId())).findFirst();
-                if(oTimeGroup != null && oTimeGroup.isPresent()){
+                if (oTimeGroup != null && oTimeGroup.isPresent()) {
                     data.setTimeGroupName(oTimeGroup.get().getName());
                 }
 

src/main/resources/mapper/template/WechatScanLoginMapper.xml

@@ -37,7 +37,7 @@
         <result property="num" column="num"/>
     </resultMap>
 
-    <resultMap id="meterMonthData" type="com.template.model.tongji.MeterMonthDataVo">
+    <resultMap id="meterMonthDataVo" type="com.template.model.tongji.MeterMonthDataVo">
         <result property="id" column="id"/>
         <result property="buildAddress" column="build_address"/>
         <result property="address" column="address"/>
@@ -46,6 +46,14 @@
         <result property="createTime" column="create_time"/>
     </resultMap>
 
+    <resultMap id="meterMonthData" type="com.template.model.tongji.MeterMonthData">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="date" column="date"/>
+        <result property="num" column="num"/>
+    </resultMap>
+
     <!--用户类别统计-->
     <select id="getUserIdTj" parameterType="com.template.model.tongji.Tj" resultMap="Tj">
         select a.name,IFNULL(b.num,0) as num from `smart_identity` a
@@ -208,19 +216,19 @@
            where a.`type`=0 and b.`type`=1 and a.name=b.`name`
              and a.`date`=b.`date` ) a
         <where>
-            <if test="meterMonthData.date != null and meterMonthData.date != ''"> AND a.date like concat(#{meterMonthData.date}, '%')</if>
+            <if test="meterMonthData.date != null and meterMonthData.date != ''"> a.date like concat(#{meterMonthData.date}, '%')</if>
         </where>
         order by a.date desc
     </select>
 
     <!--实时抄表-->
-    <select id="getMeterDayPage" resultMap="meterMonthData">
+    <select id="getMeterDayPage" resultMap="meterMonthDataVo">
         select smd.id,sm.build_address,sm.address,smd.meter_power,sm.meter_no,smd.create_time from smart_meter_detail smd
         left join smart_meter sm on sm.deleted = 0 and sm.id = smd.meter_id
         where smd.deleted = 0
         <where>
-            <if test="meterMonthData.date != null and meterMonthData.date != ''"> AND a.date like concat(#{meterMonthData.date}, '%')</if>
-            <if test="meterMonthData.type != null and meterMonthData.type != ''"> AND a.meter_type = #{meterMonthData.type}</if>
+            <if test="meterMonthData.date != null and meterMonthData.date != ''"> AND smd.create_time like concat(#{meterMonthData.date}, '%')</if>
+            <if test="meterMonthData.type != null and meterMonthData.type != ''"> AND smd.meter_type = #{meterMonthData.type}</if>
         </where>
         order by smd.create_time desc
     </select>