提交

src/main/java/org/springblade/modules/ffxc/controller/JwtdFfxcController.java

@@ -105,6 +105,13 @@ public class JwtdFfxcController extends BladeController {
 		jwtdFfxcLllsService.save(jfls);
 		JwtdFfxcEntity detail = jwtdFfxcService.detailApp(jwtdFfxc);
 		detail.setLsId(jfls.getId());
+		List<JwtdFfxcLllsEntity> jwtdFfxcLllsEntities = jwtdFfxcLllsService.selectLllsByUserIdAndFfxcId(jfls);
+		for (JwtdFfxcLllsEntity ryls : jwtdFfxcLllsEntities) {
+			if (ryls.getLlzt().equals("1") && ryls.getJf() != 0) {
+				detail.setType("1");
+				break;
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -127,7 +134,7 @@ public class JwtdFfxcController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入jwtdFfxc")
 	public R<IPage<JwtdFfxcEntity>> page(JwtdFfxcVO jwtdFfxc, Query query) {
-		IPage<JwtdFfxcEntity> pages = jwtdFfxcService.selectJwtdFfxcPage(Condition.getPage(query), jwtdFfxc);
+		IPage<JwtdFfxcEntity> pages = jwtdFfxcService.selectJwtdFfxcPage(Condition.getPage(query), jwtdFfxc) ;
 		for (JwtdFfxcEntity jwtdFfxcVO : pages.getRecords()) {
 			List<String> file = new ArrayList<>();
 			String input = jwtdFfxcVO.getXcnr();

src/main/java/org/springblade/modules/ffxc/mapper/JwtdFfxcMapper.xml

@@ -28,6 +28,7 @@
         <if test="jwtdFfxc.fbdw != null and jwtdFfxc.fbdw != ''">
             and jf.fbdw = #{jwtdFfxc.fbdw}
         </if>
+        order by jf.status desc,count desc
     </select>
 
     <select id="exportJwtdFfxc" resultType="org.springblade.modules.ffxc.excel.JwtdFfxcExcel">
@@ -37,6 +38,7 @@
     <select id="detailApp" resultMap="jwtdFfxcResultMap">
         select
             jf.*,
+            (select count(0) from jwtd_ffxc_llls jfl where jfl.ffxc_id = jf.id) as count,
             bdb.dict_value as xclxmc
         from jwtd_ffxc jf
         left join blade_dict_biz bdb on jf.xclx = bdb.dict_key and bdb.code = 'ffxclx'

src/main/java/org/springblade/modules/ffxc/pojo/entity/JwtdFfxcEntity.java

@@ -88,5 +88,7 @@ public class JwtdFfxcEntity extends BaseEntity {
 	@TableField(exist = false)
 	private String video;
 	@TableField(exist = false)
+	private String type;
+	@TableField(exist = false)
 	private List<String> file;
 }