优化

sql/fz_update.sql

@@ -137,7 +137,7 @@ INSERT INTO `frame_res`(`RES_ID`, `RES_NAME`, `RES_ALIAS`, `RES_URL`, `RES_PID`,
 -- 2024-11-04
 CREATE TABLE `ly_room_model_photo`
 (
-    `id`          int(0)                                                  NOT NULL COMMENT '主键',
+    `id`          int(0)                                                  NOT NULL AUTO_INCREMENT COMMENT '主键',
     `room_id`     int(0)                                                  NOT NULL COMMENT '考场ID',
     `seq`         int(0)                                                  NULL DEFAULT NULL COMMENT '序号',
     `photo_path`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片路径',

sql/update.sql

@@ -118,3 +118,7 @@ INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `F
 INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 3, 'exam_id', 20, '高考报名号', 'java.lang.String', 'Active', NULL);
 INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 4, 'std_sex', 10, '性别', 'java.lang.String', 'Active', NULL);
 INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 5, 'std_mobile', 20, '联系电话', 'java.lang.String', 'Active', NULL);
+
+
+UPDATE `frame_report` SET  `REPORT_SQL` = 'select distinct r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e,ly_std_ticket t\r\n where r.std_id=e.std_id and e.pay_status=\'Active\' and r.std_id=t.std_id\r\n and (r.province_flag = ? or 1=?)\r\n	and r.std_id not in (select distinct std_id from std_log where log_type=\'DownloadTicket\');'
+WHERE `REPORT_NAME` = 'TicketStdNotDownloadReport';

src/cn/hmsoft/art/data/dao/enrol/EnrolReportDao.java

@@ -390,7 +390,7 @@ public class EnrolReportDao extends PlatformDaoSupport<StdEnrol> {
 	}
 	
 	public Integer findNoDownloadTicket(String log_type) {
-		String sql = "select count(1) from ly_std_ticket t where t.std_id not in (select distinct std_id from std_log l where l.log_type=? ) ";
+		String sql = "select count(distinct std_id) from ly_std_ticket t where t.std_id not in (select distinct std_id from std_log l where l.log_type=? ) ";
 		return this.findObject(Integer.class, sql, log_type);
 	}
 
@@ -413,8 +413,8 @@ public class EnrolReportDao extends PlatformDaoSupport<StdEnrol> {
 	}
 
 	public Pager pageTicketStd(Integer start, Integer limit, String provinceFlag, Boolean downloadFlag, QueryOrder queryOrder) {
-		StringBuilder sql = new StringBuilder(" select r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e  ");
-		sql.append("  where r.std_id=e.std_id and e.pay_status='Active' ");
+		StringBuilder sql = new StringBuilder(" select distinct r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e,ly_std_ticket t  ");
+		sql.append("  where r.std_id=e.std_id and e.pay_status='Active' and t.std_id=r.std_id ");
 		if (StringHelper.isNotEmpty(provinceFlag)) {
 			sql.append(" and r.province_flag = '").append(provinceFlag).append("'");
 		}

src/cn/hmsoft/art/data/dao/ly/LyRoomModelPhotoDao.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class LyRoomModelPhotoDao extends PlatformDaoSupport<LyRoomModelPhoto> {
 
-
-
+    public LyRoomModelPhoto findRoomModel(int roomId, int roomImageType) {
+        String sql = "select * from ly_room_model_photo where room_id=? and seq=? ";
+        return this.findBySql(sql, roomId, roomImageType);
+    }
 }

src/cn/hmsoft/art/enrol/control/weixin/WeixinInitControl.java

@@ -120,7 +120,7 @@ public class WeixinInitControl extends AjaxControl {
 		// 缓存下用户地址
 		this.getSession().setAttribute(ArtParamHelper.ArtYear, agent.getUserAddr());
 
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 
 		this.getSession().setAttribute(ArtParamHelper.SessionName_EnrolWeixinUser, user);
 
@@ -135,7 +135,7 @@ public class WeixinInitControl extends AjaxControl {
 
 		map.put("WxUser", user);
 		// 参数信息
-		List<FrameParam> paramArray = new ArrayList<FrameParam>();
+		List<FrameParam> paramArray = new ArrayList<>();
 
 		paramArray.addAll(ArtParamHelper.listParams(ArtParamType.Gobal));
 		paramArray.addAll(ArtParamHelper.listParams(ArtParamType.Enrol));

src/cn/hmsoft/art/service/ex/pad/PadAppService.java

@@ -72,12 +72,22 @@ public class PadAppService extends ArtService {
 
 		// 关联考场
 		String photoPath = "mote" + File.separator + rw.getRoom_name() + "(" + rw.getRoom_addr() + ")" + File.separator + newFile.getName();
-		LyRoomModelPhoto photo = new LyRoomModelPhoto();
-		photo.setRoom_id(room_id);
-		photo.setPhoto_path(photoPath);
-		photo.setSeq(room_image_type);
-		photo.setCreate_time(LocalDateTime.now());
-		roomModelPhotoDao.insert(photo);
+
+		//是否存在
+		LyRoomModelPhoto roomModel = roomModelPhotoDao.findRoomModel(room_id, room_image_type);
+		if(roomModel == null) {
+			LyRoomModelPhoto photo = new LyRoomModelPhoto();
+			photo.setRoom_id(room_id);
+			photo.setPhoto_path(photoPath);
+			photo.setSeq(room_image_type);
+			photo.setCreate_time(LocalDateTime.now());
+			roomModelPhotoDao.insert(photo);
+		} else {
+			roomModel.setPhoto_path(photoPath);
+			roomModel.setCreate_time(LocalDateTime.now());
+			roomModelPhotoDao.update(roomModel);
+		}
+
 	}
 
 	public void uploadImage(int std_id, int agent_id, int room_id, int subject_id, String img_time, MultipartFile file) {
@@ -129,6 +139,7 @@ public class PadAppService extends ArtService {
 		try {
 			source.transferTo(target);
 		} catch (Exception e) {
+			e.printStackTrace();
 			LogHelper.error(e);
 			return false;
 		}