Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -217,4 +217,11 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> demandRules = universalMapper.getDemandRulesCode(map);
         return success(demandRules);
     }
+
+    @ApiOperation("获取身份证内码,用于判断该车辆是否有")
+    @PostMapping("/getIdCardCode")
+    public RESTfulResult getIdCardCode(@RequestBody Map<String,Object> map) {
+        String idCardCode = universalMapper.getIdCardCode(map);
+        return success(idCardCode);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -69,4 +69,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getDemandRulesCode(Map<String, Object> map);
 
+    String getIdCardCode(Map<String, Object> map);
+
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -651,13 +651,25 @@
         select
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_NAME "label",
+        RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+        (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+        THEN '-' || RC.MATERIAL_SPECIFICATION
+        WHEN RC.MATERIAL_MODEL IS NOT NULL
+        THEN '-' || RC.MATERIAL_MODEL
+        ELSE ''
+        END) "label",
         RC.MATERIAL_NAME "text"
         from RMS_MATERIAL RC
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
+                AND REGEXP_LIKE(RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+                (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+                THEN '-' || RC.MATERIAL_SPECIFICATION
+                WHEN RC.MATERIAL_MODEL IS NOT NULL
+                THEN '-' || RC.MATERIAL_MODEL
+                ELSE ''
+                END), #{index})
             </if>
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
@@ -670,7 +682,13 @@
             select
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
-            RC.MATERIAL_NAME "label",
+            RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+            (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+            THEN '-' || RC.MATERIAL_SPECIFICATION
+            WHEN RC.MATERIAL_MODEL IS NOT NULL
+            THEN '-' || RC.MATERIAL_MODEL
+            ELSE ''
+            END) "label",
             RC.MATERIAL_NAME "text"
             from RMS_MATERIAL RC
             WHERE RC.MATERIAL_ID in
@@ -878,5 +896,10 @@
             </if>
         </where>
     </select>
+    <select id="getIdCardCode" resultType="java.lang.String">
+        SELECT RC.INNNER_CODE FROM RMS_PERSONNEL RC
+        WHERE RC.PERSONNEL_JOB_NUMBER = #{jobNumber}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 
 </mapper>