Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/PmWorkReport.java

@@ -112,8 +112,7 @@ public class PmWorkReport implements Serializable {
     private Integer readFlag;
 
     /**
-     * 是否同步钉钉 默认：0，同步；1：不同步
+     * 是否已同步钉钉 默认：0，未同步；1：已同步
      */
-    @TableField(exist = false)
-    private Integer dingTalk;
+    private Integer sendDingTalk;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -131,7 +131,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         //固定返回七条数据，没有内容也要设置时间给前端渲染
         LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
         queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getSubmitDate, PmWorkReport::getUpdateTime,
-                PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo, PmWorkReport::getDingTalk)
+                PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo, PmWorkReport::getSendDingTalk)
                 .eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
                 .between(PmWorkReport::getReportDate, startDate1, endDate1)
                 .orderByAsc(PmWorkReport::getReportDate)
@@ -317,7 +317,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
             //存入消息接收
             receiveMessages(ids, newReport.getId());
             //是否同步钉钉
-            if (pmWorkReport.getDingTalk() == 0) {
+            if (pmWorkReport.getSendDingTalk() == 0) {
                 sendDingTalkDailyReport(pmWorkReport);
             }
         } else if (repeat.size() > 0) {

service-iot/service-iot-biz/src/main/resources/mapper/iot/PmWorkReportMapper.xml

@@ -18,7 +18,7 @@
         <result column="update_time" property="updateTime" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
-        <result column="ding_talk" property="dingTalk" />
+        <result column="send_ding_talk" property="sendDingTalk" />
     </resultMap>
 
 </mapper>