【功能开发】app 端:存粮人,货位卡等仓房详情信息(5个接口)

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/TaskController.java

@@ -5,12 +5,10 @@ import com.unis.framework.common.pojo.CommonResult;
 import com.unis.module.coding.controller.admin.task.vo.*;
 import com.unis.module.coding.service.task.TaskService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -93,4 +91,37 @@ public class TaskController {
     public CommonResult<Boolean> setDkxxByKqId(@RequestBody TaskDkxxSaveVO saveVO) {
         return success(taskService.setDkxxByKqId(saveVO));
     }
+
+    @GetMapping("/getHwkByCfId")
+    @Operation(summary = "根据仓房获得[货位卡]信息")
+    @Parameter(name = "cfId", description = "仓房id", required = true, example = "1024")
+    public CommonResult<TaskHwkRespVO> getHwkByCfId(@RequestParam("cfId") Long cfId) {
+        return success(taskService.getHwkByCfId(cfId));
+    }
+
+    @GetMapping("/getSyxxByCfId")
+    @Operation(summary = "根据仓房获得[损益信息]信息")
+    @Parameter(name = "cfId", description = "仓房id", required = true, example = "1024")
+    public CommonResult<TaskSyxxRespVO> getSyxxByCfId(@RequestParam("cfId") Long cfId) {
+        return success(taskService.getSyxxByCfId(cfId));
+    }
+
+    @GetMapping("/getLqjcxxByCfId")
+    @Operation(summary = "根据仓房获得[粮情检测]信息")
+    @Parameter(name = "cfId", description = "仓房id", required = true, example = "1024")
+    public CommonResult<TaskLqjcxxRespVO> getLqjcxxByCfId(@RequestParam("cfId") Long cfId) {
+        return success(taskService.getLqjcxxByCfId(cfId));
+    }
+
+    @PostMapping("/getCrkxxByCfId")
+    @Operation(summary = "根据仓房获得[出入库]信息列表")
+    public CommonResult<IPage<TaskCrkxxRespVO>> getCrkxxByCfId(@RequestBody TaskPageReqVO pageReqVO) {
+        return success(taskService.getCrkxxByCfId(pageReqVO));
+    }
+
+    @PostMapping("/getZjxxByCfId")
+    @Operation(summary = "根据仓房获得[质检]信息列表")
+    public CommonResult<IPage<TaskZjxxRespVO>> getZjxxByCfId(@RequestBody TaskPageReqVO pageReqVO) {
+        return success(taskService.getZjxxByCfId(pageReqVO));
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskCaxxRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 仓房信息 Response VO")
+@Schema(description = "APP - 仓房信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskCaxxRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskCnxxRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 财年信息 Response VO")
+@Schema(description = "APP - 财年信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskCnxxRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskCrkxxRespVO.java

@@ -0,0 +1,42 @@
+package com.unis.module.coding.controller.admin.task.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.unis.framework.excel.core.annotations.DictFormat;
+import com.unis.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "APP - 出入库信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskCrkxxRespVO {
+
+    @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31491")
+    private Long id;
+
+    @Schema(description = "粮食品种名称")
+    private String lspzmc;
+
+    @Schema(description = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)")
+    @ExcelProperty(value = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)", converter = DictConvert.class)
+    @DictFormat("system_lsdj")
+    private String lsdjbm;
+
+    @Schema(description = "净重(公斤)")
+    private BigDecimal jz;
+
+    @Schema(description = "车船号")
+    private String cch;
+
+    @Schema(description = "出入库类型(0:出库,1:入库)")
+    private Integer crklx;
+
+    @Schema(description = "附件多个逗号隔开','(INFRA_FILE.ID)")
+    private String fileIds;
+
+    @Schema(description = "业务时间")
+    private String ywsj;
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskCwxxRespVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.List;
 
-@Schema(description = "管理后台 - 财务信息 Response VO")
+@Schema(description = "APP - 财务信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskCwxxRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 财年信息 Response VO")
+@Schema(description = "APP - 打卡信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskDkxxRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxSaveVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 财年信息 Response VO")
+@Schema(description = "APP - 打卡信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskDkxxSaveVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskHwkRespVO.java

@@ -0,0 +1,59 @@
+package com.unis.module.coding.controller.admin.task.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "APP - 货位卡信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskHwkRespVO {
+
+    @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25325")
+    private Long id;
+
+    @Schema(description = "仓房名称")
+    private String cfmc;
+
+    @Schema(description = "货位名称")
+    private String hwmc;
+
+    @Schema(description = "粮食品种名称")
+    private String lspzmc;
+
+    @Schema(description = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)")
+    private String lsdjbm;
+
+    @Schema(description = "收获年度")
+    private Integer shnd;
+
+    @Schema(description = "产地编码(system_area_level.area_code)")
+    private String cdbm;
+
+    @Schema(description = "产地名称")
+    private String areaName;
+
+    @Schema(description = "入库时间")
+    private String rksj;
+
+    @Schema(description = "实际数量(吨)")
+    private BigDecimal sjsl;
+
+    @Schema(description = "计价数量(吨)")
+    private BigDecimal jjsl;
+
+    @Schema(description = "保管方式")
+    private String bgfs;
+
+    @Schema(description = "保管员姓名")
+    private String bgyxm;
+
+    @Schema(description = "仓房id(DELIVERY_CAXX.ID)", example = "26067")
+    private Long cfId;
+
+    @Schema(description = "库区id(DELIVERY_KQXX.ID)", example = "14953")
+    private Long kqid;
+
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskKqxxRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 库区信息 Response VO")
+@Schema(description = "APP - 库区信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskKqxxRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskLqjcxxRespVO.java

@@ -0,0 +1,56 @@
+package com.unis.module.coding.controller.admin.task.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "APP - 粮情检测信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskLqjcxxRespVO {
+
+    @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16670")
+    private Long id;
+
+    @Schema(description = "仓房id(DELIVERY_CAXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12922")
+    private Long cfId;
+
+    @Schema(description = "货位卡id(DELIVERY_HWK.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "8842")
+    private Long hwkId;
+
+    @Schema(description = "仓房外温(℃)")
+    private BigDecimal cww;
+
+    @Schema(description = "仓房外湿度(%)")
+    private BigDecimal cws;
+
+    @Schema(description = "仓房内温(℃)")
+    private BigDecimal cnw;
+
+    @Schema(description = "仓房内湿(%)")
+    private BigDecimal cns;
+
+    @Schema(description = "粮食最高温(℃)")
+    private BigDecimal lszgw;
+
+    @Schema(description = "粮食最低温(℃)")
+    private BigDecimal lszdw;
+
+    @Schema(description = "粮食平均温(℃)")
+    private BigDecimal lspjw;
+
+    @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.URL)")
+    private String fileIds;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "粮食品种名称")
+    private String lspzmc;
+
+    @Schema(description = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)")
+    private String lsdjbm;
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskPageReqVO.java

@@ -8,7 +8,7 @@ import lombok.ToString;
 
 import java.util.List;
 
-@Schema(description = "管理后台 - 任务列表 分页 Request VO")
+@Schema(description = "APP - 任务列表 分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -73,4 +73,7 @@ public class TaskPageReqVO extends PageParam {
 
     private String creator;
 
+    @Schema(description = "出入库类型(0:出库,1:入库)")
+    private Integer crklx;
+
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskRespVO.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 任务列表 Response VO")
+@Schema(description = "APP - 任务列表 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TaskRespVO {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskSyxxRespVO.java

@@ -0,0 +1,56 @@
+package com.unis.module.coding.controller.admin.task.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "APP - 损益信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskSyxxRespVO {
+
+    @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25360")
+    private Long id;
+
+    @Schema(description = "仓房id(DELIVERY_CAXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "15848")
+    private Long cfId;
+
+    @Schema(description = "货位卡id(DELIVERY_HWK.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "15915")
+    private Long hwkId;
+
+    @Schema(description = "入库净重(吨)")
+    private BigDecimal rkjz;
+
+    @Schema(description = "入库水分")
+    private String rksf;
+
+    @Schema(description = "入库杂质")
+    private String rkzz;
+
+    @Schema(description = "出库净重(吨)")
+    private BigDecimal ckjz;
+
+    @Schema(description = "出库水分")
+    private String cksf;
+
+    @Schema(description = "出库杂质")
+    private String ckzz;
+
+    @Schema(description = "损益是否正常(0:不正常,1:正常)")
+    private Integer sfzc;
+
+    @Schema(description = "水杂减量")
+    private BigDecimal szjl;
+
+    @Schema(description = "自然耗定额(吨)")
+    private BigDecimal zrhde;
+
+    @Schema(description = "超耗数量(吨)")
+    private BigDecimal chsl;
+
+    @Schema(description = "损益数量（吨")
+    private BigDecimal sysl;
+
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskZjxxRespVO.java

@@ -0,0 +1,44 @@
+package com.unis.module.coding.controller.admin.task.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.unis.framework.excel.core.annotations.DictFormat;
+import com.unis.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "APP - 质检信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskZjxxRespVO {
+
+    @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28249")
+    private Long id;
+
+    @Schema(description = "仓房id(DELIVERY_CAXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1241")
+    private Long cfId;
+
+    @Schema(description = "检测类型")
+    private String jclx;
+
+    @Schema(description = "检测时间")
+    private String jcsj;
+
+    @Schema(description = "粮食品种名称")
+    private String lspzmc;
+
+    @Schema(description = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)")
+    @ExcelProperty(value = "粮食等级编码(SYSTEM_DICT_DATA.LABEL)", converter = DictConvert.class)
+    @DictFormat("system_lsdj")
+    private String lsdjbm;
+
+    @Schema(description = "检测人员姓名")
+    private String jcrrxm;
+
+    @Schema(description = "粮食安全指标是否合格(0:不合格,1:合格)")
+    private Integer sfhg;
+
+    @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.ID)")
+    private String fileIds;
+
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/dk/DkMapper.java

@@ -2,9 +2,7 @@ package com.unis.module.coding.dal.mysql.dk;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
-import com.unis.module.coding.controller.admin.task.vo.TaskCaxxRespVO;
-import com.unis.module.coding.controller.admin.task.vo.TaskPageReqVO;
-import com.unis.module.coding.controller.admin.task.vo.TaskRespVO;
+import com.unis.module.coding.controller.admin.task.vo.*;
 import com.unis.module.coding.dal.dataobject.dk.DkDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +28,14 @@ public interface DkMapper extends BaseMapperX<DkDO> {
     IPage<TaskRespVO> getAllStoreroomList(IPage<TaskRespVO> page,@Param("pageReqVO")  TaskPageReqVO pageReqVO);
 
     List<TaskCaxxRespVO> getCaxxByKqIdForClr(@Param("pageReqVO") TaskPageReqVO reqVO);
+
+    TaskHwkRespVO getHwkByCfId(Long cfId);
+
+    TaskSyxxRespVO getSyxxByCfId(Long cfId);
+
+    TaskLqjcxxRespVO getLqjcxxByCfId(Long cfId);
+
+    IPage<TaskCrkxxRespVO> getCrkxxByCfId(IPage<TaskCrkxxRespVO> page,@Param("pageReqVO") TaskPageReqVO pageReqVO);
+
+    IPage<TaskZjxxRespVO> getZjxxByCfId(IPage<TaskZjxxRespVO> page, @Param("pageReqVO") TaskPageReqVO pageReqVO);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskService.java

@@ -34,4 +34,14 @@ public interface TaskService {
     Boolean getStoreroom(TaskPageReqVO reqVO);
 
     List<TaskCaxxRespVO> getCaxxByKqIdForClr(TaskPageReqVO reqVO);
+
+    TaskHwkRespVO getHwkByCfId(Long cfId);
+
+    TaskSyxxRespVO getSyxxByCfId(Long cfId);
+
+    TaskLqjcxxRespVO getLqjcxxByCfId(Long cfId);
+
+    IPage<TaskCrkxxRespVO> getCrkxxByCfId(TaskPageReqVO pageReqVO);
+
+    IPage<TaskZjxxRespVO> getZjxxByCfId(TaskPageReqVO pageReqVO);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -47,9 +47,9 @@ import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exce
 
 
 /**
- * 省已选 Service 实现类
+ * app Service 实现类
  *
- * @author 超级管理员
+ * @author duhuajie
  */
 @Service
 @Validated
@@ -287,6 +287,33 @@ public class TaskServiceImpl implements TaskService {
         return null;
     }
 
+    @Override
+    public TaskHwkRespVO getHwkByCfId(Long cfId) {
+        return dkMapper.getHwkByCfId(cfId);
+    }
+
+    @Override
+    public TaskSyxxRespVO getSyxxByCfId(Long cfId) {
+        return dkMapper.getSyxxByCfId(cfId);
+    }
+
+    @Override
+    public TaskLqjcxxRespVO getLqjcxxByCfId(Long cfId) {
+        return dkMapper.getLqjcxxByCfId(cfId);
+    }
+
+    @Override
+    public IPage<TaskCrkxxRespVO> getCrkxxByCfId(TaskPageReqVO pageReqVO) {
+        IPage<TaskCrkxxRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        return dkMapper.getCrkxxByCfId(page, pageReqVO);
+    }
+
+    @Override
+    public IPage<TaskZjxxRespVO> getZjxxByCfId(TaskPageReqVO pageReqVO) {
+        IPage<TaskZjxxRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        return dkMapper.getZjxxByCfId(page, pageReqVO);
+    }
+
     @NotNull
     private static DkDO getDkDO(TaskDkxxSaveVO saveVO, Long loginUserId) {
         DkDO saveDo = BeanUtils.toBean(saveVO, DkDO.class);

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -184,4 +184,77 @@
         ORDER BY
         dc.ID desc
     </select>
+    <select id="getHwkByCfId" resultType="com.unis.module.coding.controller.admin.task.vo.TaskHwkRespVO">
+        SELECT
+            dh.CF_ID ,
+            dc.CFMC ,
+            dh.HWMC ,
+            dh.LSPZMC ,
+            dh.LSDJBM ,
+            dh.SHND ,
+            dh.CDBM ,
+            sal."area_name" ,
+            TO_CHAR( dh.RKSJ ,'yyyy-MM-dd HH:mm:ss') as RKSJ,
+            dh.SJSL ,
+            dh.JJSL ,
+            dh.BGFS ,
+            dh.BGYXM
+        FROM
+            DELIVERY_HWK dh
+                LEFT JOIN DELIVERY_CAXX dc ON dc.ID = dh.CF_ID
+                LEFT JOIN "system_area_level" sal ON sal."area_code" = dh.cdbm AND sal."deleted" =0
+        WHERE
+            dh.DELETED = 0 AND dc.DELETED = 0 and dh.CF_ID = #{cfId}
+            LIMIT 1
+    </select>
+    <select id="getSyxxByCfId" resultType="com.unis.module.coding.controller.admin.task.vo.TaskSyxxRespVO">
+        SELECT * FROM DELIVERY_SYXX ds WHERE ds.DELETED = 0  and ds.CF_ID = #{cfId}
+            LIMIT 1
+    </select>
+    <select id="getLqjcxxByCfId" resultType="com.unis.module.coding.controller.admin.task.vo.TaskLqjcxxRespVO">
+        SELECT
+            dl.*,dh.LSPZMC ,dh.LSDJBM
+        FROM
+            DELIVERY_LQJCXX dl
+        LEFT JOIN DELIVERY_HWK dh ON dh.ID = dl.HWK_ID
+        WHERE
+            dl.DELETED = 0 and dl.CF_ID = #{cfId}
+            LIMIT 1
+    </select>
+    <select id="getCrkxxByCfId" resultType="com.unis.module.coding.controller.admin.task.vo.TaskCrkxxRespVO">
+        SELECT
+            dc.ID ,
+            dc.LSPZMC ,
+            dc.LSDJBM ,
+            dc.JZ ,
+            dc.CCH ,
+            dc.FILE_IDS ,
+            dc.CRKLX ,
+            CASE WHEN dc.CRKLX = 0 THEN TO_CHAR( dc.CMSJ  ,'yyyy-MM-dd HH:mm:ss') ELSE TO_CHAR( dc.RMSJ  ,'yyyy-MM-dd HH:mm:ss') END AS YWSJ
+        FROM
+            DELIVERY_CRKXX dc
+        WHERE
+            dc.DELETED = 0 and dc.CF_ID = #{pageReqVO.caId}
+        <if test="pageReqVO.crklx != null">
+            AND dc.CRKLX = #{pageReqVO.crklx}
+        </if>
+        ORDER BY ywsj DESC ,dc.ID DESC
+    </select>
+    <select id="getZjxxByCfId" resultType="com.unis.module.coding.controller.admin.task.vo.TaskZjxxRespVO">
+        SELECT
+            dz.ID ,
+            dz.CF_ID ,
+            dz.JCSJ ,
+            dz.JCLX ,
+            dz.LSPZMC ,
+            dz.LSDJBM ,
+            dz.SFHG ,
+            dz.JCRRXM ,
+            dz.FILE_IDS
+        FROM
+            DELIVERY_ZJXX dz
+        WHERE
+            dz.DELETED = 0 AND dz.CF_ID = #{pageReqVO.caId}
+        ORDER BY dz.JCSJ DESC ,dz.ID  DESC
+    </select>
 </mapper>

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/dict/DictDataController.java

@@ -11,6 +11,7 @@ import com.unis.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
 import com.unis.module.system.controller.admin.dict.vo.data.DictDataRespVO;
 import com.unis.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
 import com.unis.module.system.controller.admin.dict.vo.data.DictDataSimpleRespVO;
+import com.unis.module.system.controller.app.dict.vo.AppDictDataRespVO;
 import com.unis.module.system.dal.dataobject.dict.DictDataDO;
 import com.unis.module.system.service.dict.DictDataService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -101,4 +102,12 @@ public class DictDataController {
                 BeanUtils.toBean(list, DictDataRespVO.class));
     }
 
+    @GetMapping("/type")
+    @Operation(summary = "根据字典类型查询字典数据信息")
+    @Parameter(name = "type", description = "字典类型", required = true, example = "common_status")
+    public CommonResult<List<AppDictDataRespVO>> getDictDataListByType(@RequestParam("type") String type) {
+        List<DictDataDO> list = dictDataService.getDictDataList(
+                CommonStatusEnum.ENABLE.getStatus(), type);
+        return success(BeanUtils.toBean(list, AppDictDataRespVO.class));
+    }
 }