Quellcode durchsuchen

1 总工程修改

zhangym vor 1 Jahr
Ursprung
Commit
9d0a5b9ac8

+ 44 - 0
src/main/java/com/steerinfo/dil/controller/EMSController.java

@@ -191,4 +191,48 @@ public class EMSController extends BaseRESTfulController {
     ) {
         return emsFeign.getemssalarydetailsMonthyear(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "展示票据管理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getemsticketmanagementslist")
+    Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ) {
+        return emsFeign.getemsticketmanagementslist(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value = "新增票据管理")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/insertemsticketmanagements")
+    public Map<String, Object> insertemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.insertemsticketmanagements(map);
+    }
+
+    @ApiOperation(value = "票据管理逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/deletedemsticketmanagements")
+    public Map<String, Object> deletedemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.deletedemsticketmanagements(map);
+    }
+
+    @ApiOperation(value = "票据管理逻辑修改")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/updateemsticketmanagements")
+    public Map<String, Object> updateemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.updateemsticketmanagements(map);
+    }
 }

+ 6 - 1
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -388,5 +388,10 @@ public class UniversalController extends BaseRESTfulController {
         response.put("filePath",path);
         return success(response);
     }
-
+    @ApiModelProperty(value = "边输边查公司单位审批流程使用")
+    @PostMapping("/getCompanyMesByLike2")
+    public RESTfulResult getCompanyMesByLike2(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCompanyMesByLike2(map);
+        return success(list);
+    }
 }

+ 17 - 0
src/main/java/com/steerinfo/dil/feign/EmsFeign.java

@@ -70,6 +70,23 @@ public interface EmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize
     );
+
+
+    @PostMapping("api/v1/ems/emsticketmanagements/getemsticketmanagementslist")
+    Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize
+    );
+
+    @PostMapping("api/v1/ems/emsticketmanagements/insertemsticketmanagements")
+    Map<String, Object> insertemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsticketmanagements/deletedemsticketmanagements")
+    Map<String, Object> deletedemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsticketmanagements/updateemsticketmanagements")
+    Map<String, Object> updateemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -110,4 +110,6 @@ public interface UniversalMapper {
     List<Map<String, Object>> getRequireByLike(Map<String, Object> map);
 
     String getMaxSerialNumber();
+
+    List<Map<String, Object>> getCompanyMesByLike2(Map<String, Object> map);
 }

+ 137 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1894,4 +1894,141 @@
         from ams_trans_requirement t
         where substr(t.serial_number, 1, 10) = 'XX' || to_char(sysdate, 'yyyyMMdd')
     </select>
+
+
+<!--审批流程使用 -->
+    <select id="getCompanyMesByLike2" resultType="java.util.Map">
+        select * from (
+        select * from(
+        select
+        RC.SSO_ID "ssoId",
+        RC.SSO_CODE "ssoCode",
+        RC.COMPANY_ID "id",
+        RC.COMPANY_ID "businessCompanyId",
+        RC.COMPANY_ID   "key",
+        RC.COMPANY_ID "value",
+        RC.PARENT_COMPANY_ID "parentCompanyId",
+        <if test="companyType==null">
+            RC.COMPANY_TYPE || '-' ||
+        </if>
+        RC.COMPANY_NAME "label",
+        RC.COMPANY_NAME "text",
+        RC.COMPANY_NAME "companyName",
+        RC.CREDENTIAL_DESC  "seqNo",
+        T2 ."rootCompanyId",
+        T2 ."rootCompanyName",
+        'label' "prop"
+        from RMS_COMPANY RC
+        LEFT JOIN (
+        SELECT "companyId",MAX("level") "rootIndex" FROM
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        )
+        GROUP BY "companyId"
+        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+        LEFT JOIN
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+        <where>
+            DELETED = 0
+            <if test="companyType!=null and companyType!=''">
+                AND REGEXP_LIKE(RC.COMPANY_TYPE, #{companyType})
+            </if>
+            <if test="companyId!=null and companyId!=''">
+                AND RC.COMPANY_ID = #{companyId}
+            </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND RC.COMPANY_ID = #{businessCompanyId}
+            </if>
+            <if test="supplierCompanyId!=null and supplierCompanyId!=''">
+                AND RC.COMPANY_ID = #{supplierCompanyId}
+            </if>
+            <if test="receiveCompanyId!=null and receiveCompanyId!=''">
+                AND RC.COMPANY_ID = #{receiveCompanyId}
+            </if>
+            <if test="carrierId!=null and carrierId!=''">
+                AND RC.COMPANY_ID = #{carrierId}
+            </if>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+            </if>
+            <if test="isListed !=null and isListed!=''">
+                AND RC.is_Listed IS NOT NULL
+            </if>
+
+        </where>
+        <if test="noRow == null">
+            order by rc.register_aptitudes,LENGTH(company_name)
+        </if>
+        )
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            select * from
+            (select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            RC.PARENT_COMPANY_ID "parentCompanyId",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
+            RC.CREDENTIAL_DESC  "seqNo",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
+            SELECT "companyId",MAX("level") "rootIndex" FROM
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            )
+            GROUP BY "companyId"
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            where RC.COMPANY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+            order by to_number(RC.CREDENTIAL_DESC),LENGTH(company_name))
+        </if>
+    </select>
 </mapper>