联调nfc

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskDTO.java

@@ -29,4 +29,5 @@ public class EvaluateTaskDTO extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
+    private Date date;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -96,6 +96,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             evaluateTaskDTO.setOrgPath(sysOrg.getPath());
             evaluateTaskDTO.setOrgId(null);
         }
+        if (StringUtils.isEmpty(evaluateTaskDTO.getStatus())){
+            evaluateTaskDTO.setStatus(null);
+        }
         page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskVO.java

@@ -64,14 +64,14 @@ public class CoreEvaluateTaskVO {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
 

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -165,11 +165,12 @@
         <if test="request.evaluateName != null  and request.evaluateName != ''">
             and a.evaluate_name like concat('%', #{request.evaluateName}, '%')
         </if>
-        <if test="request.status != null ">
+
+        <if test="request.status != null and '' neq request.status">
             and a.status = #{request.status}
         </if>
-        <if test="request.startTime != null and request.endTime != null">
-            and a.start_time &gt;= #{request.startTime} AND a.end_time &lt;= #{request.endTime}
+        <if test="request.date != null and request.date != ''">
+            and e.complete_time like concat( #{request.date}, '%')
         </if>
         GROUP BY a.id
     </select>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -133,8 +133,9 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         sysNfcBind.setCreateTime(DateUtils.getNowDate());
         sysNfcBind.setDelFlag("0");
         sysNfcBind.setSource("1");
-        if(null==sysNfcBind.getLabelName()){
+        if(null==sysNfcBind.getEnable()){
             sysNfcBind.setSource("2");
+            sysNfcBind.setEnable("1");
         }
         SysOrg sysOrg = sysOrgService.selectSysOrgById(sysNfcBind.getOrgId());
         if (null != sysOrg) {