班管家 2021-12-6 9:23

src/apps/hyworkorder/hyworkorder.java

@@ -46,6 +46,22 @@ public class hyworkorder extends PaoCust {
         setValue("progress",0,11l);
     }
 
+
+    @Override
+    public void fieldValidate(Object paoField, String fieldname) throws P2Exception {
+        super.fieldValidate(paoField, fieldname);
+        if(fieldname.equalsIgnoreCase("ProjectLeader")){
+//            System.out.println("test:"+getString("ProjectLeader"));
+            PaoSetRemote hyWorkorder = P2Server.getP2Server().getPaoSet("hyWorkorder", P2Server.getP2Server().getSystemUserInfo());
+            hyWorkorder.setInsertSite(getSite());
+            hyWorkorder.setWhere("servernum='"+getString("servernum")+"' and ProjectLeader='"+getString("ProjectLeader")+"' and FADDRESS='"+getString("FADDRESS")+"'");
+            hyWorkorder.reset();
+            if(!hyWorkorder.isEmpty()){
+                throw new P2AppException("","不能指定该人员，该服务人员已经有指派工单");
+            }
+        }
+    }
+
     @Override
     public void fieldAction(Object paoField, String fieldname) throws P2Exception {
         super.fieldAction(paoField, fieldname);

src/apps/hyworkorder_team/hyworkorder_team.java

@@ -42,7 +42,7 @@ public class hyworkorder_team extends PaoCust {
             if(worker.isEmpty()){
                 throw new P2AppException("","¸ÃÈËÔ±²»´æÔÚ");
             }
-            System.out.println("asdasd");
+
             setValue("workername",worker.getPao(0).getString("FNAME"),11l);
             setValue("ftype",worker.getPao(0).getString("role"),11l);
             setValue("workephone",worker.getPao(0).getString("workphone"),11l);

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -699,10 +699,10 @@ public class HyWorkOrder extends Controller {
                 workorder.reset();
                 if(!workorder.isEmpty()){
                     PaoRemote pao = workorder.getPao(0);
-                    pao.setValue("fisscenefname",where.getBoolean("fisscenefname"),11l);
-                    pao.setValue("fistitem",where.getBoolean("fistitem"),11l);
+                    pao.setValue("fisscenefname",true,11l);
+                    pao.setValue("fistitem",where.getString("fistitem"),11l);
 //                    pao.setValue("fisperiod",where.getBoolean("fisperiod"),11l);
-                    pao.setValue("fiserror",where.getBoolean("fiserror"),11l);
+                    pao.setValue("fiserror",where.getString("fiserror"),11l);
                     if(where.containsKey("repairprice")){
                         pao.setValue("repairprice",where.getDouble("repairprice"),11l);
                     }
@@ -745,7 +745,8 @@ public class HyWorkOrder extends Controller {
         Rows rows = dbConnect.runSqlQuery(factory.getSQL());
         if(rows.isEmpty())return getReturnObject_err("ûÓд˹¤µ¥").toString();
         Row row = rows.get(0);
-        Rows url = dbConnect.runSqlQuery("select tattachmentid,fdocument,fobsurl,type,UPPER(postfix) postfix from tattachment where ownertable='HYWORKORDER' and ownerid=" + row.getInteger("ownerid"));
+        Rows url = dbConnect.runSqlQuery("select tattachmentid,fdocument,fobsurl,type,UPPER(postfix) postfix,case when postfix in ('JPG','PNG','JEPG','jpg','png','jepg') then 'image'\n" +
+                "when postfix in ('MP4','mp4') then 'video' else 'file' end type2 from tattachment where ownertable='HYWORKORDER' and ownerid=" + row.getInteger("ownerid"));
         row.put("url",url);
 
         return getReturnObject_suc(row,false).toString();