培养

src/main/java/com/ssj/dao/sys/award/dao/impl/AwardQueryDaoImpl.java

@@ -31,8 +31,8 @@ public class AwardQueryDaoImpl implements AwardQueryDao {
 		StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
         selSQL.append(" SELECT t.*, ");
-        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode t WHERE t.`status` in (0)) as not_use_number, ");
-        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode t WHERE t.`status` in (1,2,3,4)) as use_number ");
+        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode s WHERE s.award_material_id=t.id and s.`status` in (0)) as not_use_number, ");
+        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode s WHERE s.award_material_id=t.id and s.`status` in (1,2,3,4)) as use_number ");
         selSQL.append(" from tb_award_material t WHERE t.status=1  ");
         if (searchParams.get("name") != null && !searchParams.get("name").equals("")) {
         	selSQL.append(" and  t.`name` LIKE  CONCAT(CONCAT('%',?,'%')) ");

src/main/java/com/ssj/dao/sys/train/dao/impl/TrainQueryDaoImpl.java

@@ -260,7 +260,7 @@ public class TrainQueryDaoImpl  implements TrainQueryDao {
 	public Page<Map<String, Object>> findTrainUserBySysPage(Map<String, Object> params, Pageable pageable) {
 		StringBuilder sb = new StringBuilder();
 		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT * from tr_train_user t WHERE 1=1   ");
+        sb.append(" SELECT * from tr_train_user t WHERE t.status=1   ");
         if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
        	 	sb.append(" and t.role_type=?  ");
        	 	param.add(params.get("roleType"));

src/main/java/com/ssj/sys/controller/AnalysisController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.ssj.api.security.annotation.IgnoreSecurity;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.core.common.controller.BaseController;
 import com.ssj.framework.core.util.ResponseEntity;
@@ -45,7 +46,37 @@ public class AnalysisController extends BaseController {
 	@Autowired
 	private AnalysisWeekService analysisWeekService;
 	
+	@IgnoreSecurity
+	@RequestMapping("/refresh/day")
+	@ResponseBody
+	public ResponseEntity refreshDay() {
+		ResponseEntity responseEntity = new ResponseEntity();
+		try{
+        	logger.info("统计前一天的接口数据开始");
+        	analysisCountService.runTaskAnalysisCount();
+        	responseEntity.success("操作成功");
+        }catch (Exception e) {
+            logger.error("统计前一天的接口数据异常-->"+e.getMessage());
+        }
+		return responseEntity;
+	}
+	
+	@IgnoreSecurity
+	@RequestMapping("/refresh/week")
+	@ResponseBody
+	public ResponseEntity refreshWeek() {
+		ResponseEntity responseEntity = new ResponseEntity();
+		   try {
+	            logger.info("统计前一天周的接口数据开始");
+	            analysisWeekService.runTaskByAnalysisWeek();
+	            responseEntity.success("操作成功");
+	        } catch (Exception e) {
+	            logger.error("统计前一天周的接口数据异常-->"+e.getMessage());
+	        }
+		return responseEntity;
+	}
 
+	
 	//--------------------------数据汇总数据分析-------------------------------------
 
 	@RequestMapping("/index")

src/main/resources/templates/sys/award/sncode/ems.html

@@ -69,10 +69,6 @@ dtext{
 <div class="formbody">
 		<ul class="forminfo">
 			<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${awardSncode.id}"/>
-			<li>
-				<label>钉钉单号：<b>*</b></label>
-				<input type="text" id="dingNumber" class="dfinput fl" name="dingNumber" th:value="${awardSncode.dingNumber}" />
-			</li>
 			
 			<li>
 				<label>物流单号：	<b>*</b></label>
@@ -80,6 +76,12 @@ dtext{
 			</li>
 			
 			<li>
+				<label>钉钉单号：<b></b></label>
+				<input type="text" id="dingNumber" class="dfinput fl" name="dingNumber" th:value="${awardSncode.dingNumber}" />
+			</li>
+			
+			
+			<li>
 				<label>收货人：<b>*</b></label>
 				<input type="text" id="people" class="dfinput fl" name="people" th:value="${awardSncode.people}" />
 			</li>
@@ -115,8 +117,8 @@ dtext{
 <script type="text/javascript">
 
 function save(){
-	if($("#emsNumber").val()=='' && $("#emsNumber").val()==''){
-		parent.layer.msg("钉钉/物流单号不能同时为空",{icon:11});
+	if($("#emsNumber").val()==''){
+		parent.layer.msg("物流单号不能同时为空",{icon:11});
 		return
 	}
 	

src/main/resources/templates/sys/fx/merchantAllList.html

@@ -157,9 +157,9 @@
 				</a>
 			</ul>
 			
-<!-- 			<a href="javascript:;" onclick="savemerchant('')"> -->
-<!-- 				<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>添加</li> -->
-<!-- 			</a> -->
+			<a href="javascript:;" onclick="savemerchant('')">
+				<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>添加</li>
+			</a>
 		</li>
 	</ul>
 	</form>
@@ -260,10 +260,10 @@
 							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchant(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
 						</di>
 						
-<!-- 							<a href="javascript:;" th:if="${item.signType==0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'joinServiceEdit(\''+${item.id}+'\')'" class="tablelink">塾币</a> -->
-<!-- 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'mealServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a> -->
-<!-- 							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'updatemerchant(\''+${item.id}+'\',\'4\')'"   class="tablelink">删除</a> -->
-<!-- 							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchant(\''+${item.id}+'\')'"  	class="tablelink">修改</a> -->
+							<a href="javascript:;" th:if="${item.signType==0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'joinServiceEdit(\''+${item.id}+'\')'" class="tablelink">塾币</a>
+							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'mealServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a>
+							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'updatemerchant(\''+${item.id}+'\',\'4\')'"   class="tablelink">删除</a>
+							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchant(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
 						
 												
 						<a href="javascript:;" th:if="${item.status!=4 && item.libId!='' && item.libId!=null && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'untyingmerchant(\''+${item.id}+'\')'"  	class="tablelink">解绑</a>

src/main/resources/templates/sys/train/user_edit.html

@@ -52,7 +52,7 @@
 		    </li>
 			<li class="clearfix" >
 				<label>手机号码：<b>*</b></label>
-				<input type="text"  name="mobile" disabled="disabled" class="dfinput fl" th:value="${trainUser.mobile}"/>
+				<input type="text"  name="mobile" th:disabled="${trainUser.id!=null ? true : false}" class="dfinput fl" th:value="${trainUser.mobile}"/>
 			</li>
 			<li class="clearfix" >
 				<label>密码：<b>*</b></label>
@@ -71,7 +71,7 @@
 			<li>
 				<label>&nbsp;</label>
 				<button type="button" class="btn" onclick="saveFrom()">保存</button>
-				<button type="button" class="btn" onclick="window.history.go(-1);">取消</button>
+				<button type="button" class="btn" onclick="closeWin();">取消</button>
 			</li>
 		</ul>
 	</form>
@@ -83,6 +83,11 @@ $(function () {
 
 })
 
+function closeWin() {
+	parent.location.reload();
+	parent.layer.close(parent.layer.getFrameIndex(window.name));
+}
+
 function saveFrom(){
 	var url="[[${sysUrl}]]/sys/train/user/save";
 	var params = $("#submitFrom").serialize();

src/main/resources/templates/sys/train/user_list.html

@@ -36,7 +36,7 @@
 	</ul>
 </div>
 <div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/train/video/list.html}" method="post">
+	<form id="seachform" th:action="@{/sys/train/user/list.html}" method="post">
 	<input type="hidden" name="pageSize" id="pageSize" value="10" />
 	<ul class="seachform">
 		<li>