失能申请增加是否定位打卡字段

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -179,7 +179,8 @@
                a.MEDICAL_AREA               medicalArea,
                a.REVIEW_FREQUENCY     reviewFrequency,
                a.BANK_CARD_NO bankCardNo,
-               to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime
+               to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime,
+               a.is_located isLocated
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         where a.APPLY_ID = #{applyId}
@@ -247,7 +248,8 @@
                a.REVIEW_FREQUENCY     reviewFrequency,
                a.BANK_CARD_NO bankCardNo,
                to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime,
-               A.Positioning_distance positioningDistance
+               A.Positioning_distance positioningDistance,
+               a.is_located isLocated
         from (select * from CH_DISABLE_APPLY where apply_status <![CDATA[<>]]> 2 ) a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         where a.APPLY_ID = #{applyId}
@@ -309,7 +311,8 @@
                a.REVIEW_FREQUENCY     reviewFrequency,
                a.BANK_CARD_NO bankCardNo,
                to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime,
-               A.Positioning_distance positioningDistance
+               A.Positioning_distance positioningDistance,
+               a.is_located isLocated
         from (
                  select y.apply_id a_apply_id,y.APPLY_TIME,y.SRV_ORGAN_ID,y.BANK_CARD_NO,y.CHECK_NAME apply_check_name,y.APPLY_STATUS apply_check_status,
                         y.check_remark apply_check_remark,y.REASONS_REMARK,y.REASONS_REVIEW,y.REVIEW_FREQUENCY,y.MEDICAL_AREA,

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

@@ -655,4 +655,6 @@ public class ChDisableApply extends PageInfo implements Serializable {
     private Integer positioningDistance;//定位距离
 
     private static final long serialVersionUID = 1L;
+
+    private String isLocated;//是否定位打卡
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApplyHis.java

@@ -606,6 +606,8 @@ public class ChDisableApplyHis implements Serializable {
 
     private Integer positioningDistance;//定位距离
 
+    private String isLocated;//是否定位打卡
+
     private static final long serialVersionUID = 1L;
 
     public Long getApplyHisId() {

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfo.java

@@ -144,4 +144,6 @@ public class ChDisableInfo extends PageInfo implements Serializable {
     private java.util.Date exitTime;
 
     private Integer positioningDistance;//定位距离
+
+    private String isLocated;//是否定位打卡
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfoChange.java

@@ -473,7 +473,7 @@ public class ChDisableInfoChange {
 
     private Integer positioningDistance;//定位距离
 
-
+    private String isLocated;//是否定位打卡
 
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

@@ -137,4 +137,6 @@ public class DisableExamineInfoVO {
 
     //定位距离
     private  Integer positioningDistance;//定位距离
+
+    private String isLocated;//是否定位打卡
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableUpdateDetailVO.java

@@ -159,4 +159,6 @@ public class DisableUpdateDetailVO {
 
 
     private Integer positioningDistance;//定位距离
+
+    private String isLocated;//是否定位打卡
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -257,6 +258,15 @@ public class UserController {
             systemUser.setUserId(reqUserInfo.getId());
             flag = true;
         }
+        if (!reqUserInfo.getOrganId().equals(systemUser.getOrganId())) {//页面修改了适用机构，后台未保存，页面如果没有选择适用机构会报错
+            systemUser.setOrganId(reqUserInfo.getOrganId());
+            flag = true;
+        }
+
+        if (!Objects.equals(reqUserInfo.getEnable(), systemUser.getUserStatus())) {//页面修改了是否停用，后台未保存
+            systemUser.setUserStatus(reqUserInfo.getEnable());
+            flag = true;
+        }
         if (flag) {
             systemUser.setUpdatedTime(new Date());
             userInfoService.updateById(systemUser);