Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

dber/考勤管理.dmj

-{
+{
@@ -1137,7 +1137,7 @@
           "OrderNo": 11,
           "GraphDesc": "Left=661.40\r\nTop=311.30",
           "MetaFields": {
-            "Count": 4,
+            "Count": 5,
             "items": [
               {
                 "ID": 1,
@@ -1180,6 +1180,16 @@
                 "DataType": 2,
                 "KeyFieldType": 3,
                 "Nullable": true
+              },
+              {
+                "ID": 16,
+                "Name": "is_gly",
+                "Memo": "0：否；1：是",
+                "CreateDate": "2020/4/10 15:03:44",
+                "OrderNo": 5,
+                "DisplayName": "是否为管理员",
+                "DataType": 2,
+                "Nullable": true
               }
             ]
           }
@@ -1190,7 +1200,7 @@
           "OrderNo": 12,
           "GraphDesc": "Left=758.00\r\nTop=929.00",
           "MetaFields": {
-            "Count": 19,
+            "Count": 21,
             "items": [
               {
                 "ID": 1,
@@ -1370,6 +1380,25 @@
                 "DataType": 2,
                 "KeyFieldType": 3,
                 "Nullable": true
+              },
+              {
+                "ID": 42,
+                "Name": "punchmode",
+                "Memo": "==>1：指紋；2：人脸；3：密码；4：ID卡",
+                "CreateDate": "2020/4/10 15:01:03",
+                "OrderNo": 20,
+                "DisplayName": "考勤机打卡方式",
+                "DataType": 2,
+                "Nullable": true
+              },
+              {
+                "ID": 43,
+                "Name": "punchequipment",
+                "CreateDate": "2020/4/10 15:01:03",
+                "OrderNo": 21,
+                "DisplayName": "打卡设备",
+                "DataType": 1,
+                "Nullable": true
               }
             ]
           }

src/main/java/cn/timer/api/config/Initialization/InitializeSetting.java

@@ -19,7 +19,7 @@ public class InitializeSetting implements ApplicationRunner {
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
 		
-		StaticVariable.mac_command = "http://192.168.172.116:8088/cmd";//考勤机执行命令
+		StaticVariable.mac_command = "http://192.168.3.143:8088/cmd";//考勤机执行命令
 	}
 
 }

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -34,6 +34,7 @@ import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -5885,9 +5886,11 @@ public class AttController {
 		String asIOMode = "0";
 		String sStdIoTime = jsonArray.get("sStdIoTime").toString();
 		
+		AttendanceMachine kqjdev = attendancemachineservice.selectByQyidDev(asDevId);
+		
 /***********************************************************考勤机打卡(开始)********************************************************************************************/
 		
-		YgglMainEmp user = new LambdaQueryChainWrapper<YgglMainEmp>(ygglmainempmapper).eq(YgglMainEmp::getEmpNum, asUserId).one();
+		YgglMainEmp user = new LambdaQueryChainWrapper<YgglMainEmp>(ygglmainempmapper).eq(YgglMainEmp::getEmpNum, asUserId).eq(YgglMainEmp::getOrgCode, kqjdev.getQyid()).one();
 		if(user != null) {
 			int qyid = user.getOrgCode();//坏小孩【企业id】
 			int userid = user.getEmpNum();//用户id	

src/main/java/cn/timer/api/dao/kqgl/AttendanceMachineMapper.java

@@ -20,4 +20,6 @@ public interface AttendanceMachineMapper {
     List<AttendanceMachine> selectByPrimaryByQyid(Integer qyid);
     
     int updateByPrimaryByid(String name,int id);
+    
+    AttendanceMachine selectByQyidDev(String code);
 }
\ No newline at end of file

src/main/resources/mapping/kqgl/AttendanceMachineMapper.xml

@@ -123,4 +123,11 @@
     set name = #{name,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+  <select id="selectByQyidDev" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from kqgl_asso_kqj
+    where code = #{code,jdbcType=VARCHAR}
+  </select>
 </mapper>
\ No newline at end of file